@im-nobsidian/core 0.3.1 → 0.3.2

package/dist/index.js

@@ -70,7 +70,11 @@ var ConfigSchema = z.object({
     // 비마크다운 파일(첨부) 업로드/다운로드 동시성
     fileConcurrency: z.number().min(1).max(10).default(2),
     // 다운로드 파일 크기 상한 (bytes, 기본 100MB)
-    maxFileSizeBytes: z.number().min(1024).default(100 * 1024 * 1024)
+    maxFileSizeBytes: z.number().min(1024).default(100 * 1024 * 1024),
+    // 미디어·첨부 다운로드 1회 시도의 시간 상한 (ms, 기본 300초). 0 = 상한 없음(권장하지 않음)
+    mediaDownloadTimeoutMs: z.number().min(0).max(18e5).default(3e5),
+    // 페이지 1건 처리의 시간 상한 (ms, 기본 30분). 한 건이 동기화 전체를 멈춰 세우지 못하게 한다. 0 = 상한 없음
+    itemTimeoutMs: z.number().min(0).max(72e5).default(18e5)
   })
 });
 var DEFAULT_CONFIG = {
@@ -114,7 +118,9 @@ var DEFAULT_CONFIG = {
     mediaMaxRetries: 3,
     mediaRetryBaseMs: 1e3,
     fileConcurrency: 2,
-    maxFileSizeBytes: 100 * 1024 * 1024
+    maxFileSizeBytes: 100 * 1024 * 1024,
+    mediaDownloadTimeoutMs: 3e5,
+    itemTimeoutMs: 18e5
   }
 };
 
@@ -761,13 +767,13 @@ var PropertyMapper = class {
         const items = Array.isArray(value) ? value : [value];
         const ids = [];
         for (const item of items) {
-          const str = String(item);
-          const match = str.match(WIKILINK_REGEX);
+          const str2 = String(item);
+          const match = str2.match(WIKILINK_REGEX);
           if (match?.[1] && this.wikilinkResolver) {
             const pageId = this.wikilinkResolver.resolve(match[1]);
             if (pageId) ids.push({ id: pageId });
-          } else if (str.match(/^[0-9a-f-]{32,36}$/)) {
-            ids.push({ id: str });
+          } else if (str2.match(/^[0-9a-f-]{32,36}$/)) {
+            ids.push({ id: str2 });
           }
         }
         return ids.length > 0 ? { relation: ids } : null;
@@ -956,10 +962,12 @@ function isNotionObjectNotFound(error) {
   return e.code === "object_not_found" || e.status === 404;
 }
 var DiscoveryTooLargeError = class extends Error {
-  constructor(elapsedMs) {
+  constructor(elapsedMs, partial = []) {
     super(`subtree discovery exceeded time budget (${elapsedMs}ms)`);
+    this.partial = partial;
     this.name = "DiscoveryTooLargeError";
   }
+  partial;
 };
 var NotionClient = class _NotionClient {
   client;
@@ -987,7 +995,7 @@ var NotionClient = class _NotionClient {
     this.batchSize = options.batchSize ?? 100;
   }
   /** config.advanced 의 운영 튜닝값으로 클라이언트를 생성한다 (매직넘버 단일 진실원). */
-  static fromConfig(config, fetch2) {
+  static fromConfig(config, fetch) {
     const a = config.advanced;
     return new _NotionClient({
       token: config.notion.token,
@@ -999,7 +1007,7 @@ var NotionClient = class _NotionClient {
       retryBackoffFactor: a.retryBackoffFactor,
       pageSize: a.pageSize,
       batchSize: a.batchSize,
-      ...fetch2 ? { fetch: fetch2 } : {}
+      ...fetch ? { fetch } : {}
     });
   }
   getInternalClient() {
@@ -1193,36 +1201,25 @@ var NotionClient = class _NotionClient {
     }
     return schema;
   }
+  /**
+   * DB 속성 스키마 전체(선택지·status 그룹 포함).
+   *
+   * 옵션 `id` 까지 그대로 실어 보낸다 — 산출물에는 안 나가지만, status 뷰 필터가
+   * 옵션명이 아니라 **그룹명**(`To-do` 등)으로 오기 때문에 `groups[].optionIds` 를
+   * 옵션명으로 되돌리려면 이 id 가 있어야 한다. 예전엔 여기서 id 를 떨궈,
+   * 그룹으로 필터링된 뷰를 Bases 로 옮길 방법이 아예 없었다.
+   */
   async getDatabaseSchemaFull(databaseId) {
     const db = await this.fetchDatabaseModern(databaseId);
     const properties = db.properties;
     if (!properties) return {};
     const schema = {};
     for (const [name, prop] of Object.entries(properties)) {
-      const entry = {
+      schema[name] = {
         id: prop.id,
-        type: prop.type
+        type: prop.type,
+        ...extractPropertyChoices(prop)
       };
-      if (prop.type === "select" || prop.type === "multi_select") {
-        const typeData = prop[prop.type];
-        if (typeData?.options) {
-          entry.options = typeData.options.map((o) => ({ name: o.name, color: o.color }));
-        }
-      }
-      if (prop.type === "status") {
-        const statusData = prop.status;
-        if (statusData?.options) {
-          entry.options = statusData.options.map((o) => ({ name: o.name, color: o.color }));
-        }
-        if (statusData?.groups) {
-          entry.groups = statusData.groups.map((g) => ({
-            name: g.name,
-            color: g.color,
-            optionIds: g.option_ids
-          }));
-        }
-      }
-      schema[name] = entry;
     }
     return schema;
   }
@@ -1375,17 +1372,32 @@ var NotionClient = class _NotionClient {
     }
     return allBlocks;
   }
-  async appendChildren(blockId, children) {
+  /**
+   * 자식 블록을 덧붙인다. `options.after` 를 주면 그 블록 **바로 뒤**에 삽입한다
+   * (기본은 맨 끝). 자리표시자를 실제 미디어 블록으로 제자리 교체할 때 필요하다.
+   *
+   * 실측(2025-09-03): position 삽입 응답의 `results` 는 방금 넣은 블록뿐 아니라
+   * 삽입 지점 이후의 형제까지 함께 돌려준다. 앞에서부터 batch 길이만큼이 새 블록이므로
+   * 배치를 이어 붙일 때는 그 마지막 id 를 다음 기준점으로 삼는다.
+   */
+  async appendChildren(blockId, children, options) {
     const batchSize = this.batchSize;
+    const created = [];
+    let after = options?.after;
     for (let i = 0; i < children.length; i += batchSize) {
       const batch = children.slice(i, i + batchSize);
-      await this.withRateLimit(
+      const response = await this.withRateLimit(
         () => this.client.blocks.children.append({
           block_id: blockId,
-          children: batch
+          children: batch,
+          ...after ? { position: { type: "after_block", after_block: { id: after } } } : {}
         })
       );
+      const ids = response.results.slice(0, batch.length).map((b) => b.id);
+      created.push(...ids);
+      if (after && ids.length > 0) after = ids[ids.length - 1];
     }
+    return created;
   }
   async deleteBlock(blockId) {
     await this.withRateLimit(() => this.client.blocks.delete({ block_id: blockId }));
@@ -1509,6 +1521,8 @@ var NotionClient = class _NotionClient {
    *
    * @param opts.deadlineMs `Date.now()` 기준 마감 시각. 각 페이지 처리 전 초과를 검사해
    *   초과 시 {@link DiscoveryTooLargeError}를 던진다(대규모 서브트리 → search 폴백 유도).
+   *   **그때까지 찾은 페이지는 에러의 `partial` 에 실어 보낸다** — 버리면 호출측이 두
+   *   경로를 경합시키게 되고, 어느 쪽이 이기는지를 벽시계가 정하게 된다(R12-A).
    *   미지정 시 무제한(기존 동작 유지 — 테스트 mock 경로는 영향 없음).
    */
   async getChildPagesRecursive(parentId, opts) {
@@ -1519,7 +1533,7 @@ var NotionClient = class _NotionClient {
       const nextLevel = [];
       for (const id of currentLevel) {
         if (opts?.deadlineMs !== void 0 && Date.now() > opts.deadlineMs) {
-          throw new DiscoveryTooLargeError(Date.now() - start);
+          throw new DiscoveryTooLargeError(Date.now() - start, all);
         }
         let children;
         try {
@@ -1583,7 +1597,10 @@ var NotionClient = class _NotionClient {
         let bp;
         try {
           bp = (await this.getBlock(bid)).parent;
-        } catch {
+        } catch (error) {
+          getLogger().warn(
+            `[Im-Nobsidian] \uBD80\uBAA8 \uBE14\uB85D \uD574\uC18C \uC2E4\uD328 (${bid}) \u2014 \uC774 \uBE14\uB85D\uC5D0 \uC911\uCCA9\uB41C \uD398\uC774\uC9C0\uB294 search \uB514\uC2A4\uCEE4\uBC84\uB9AC\uC5D0\uC11C \uC81C\uC678\uB428: ${error instanceof Error ? error.message : String(error)}`
+          );
           blockOwner.set(bid, null);
           return null;
         }
@@ -1741,34 +1758,78 @@ var NotionClient = class _NotionClient {
   }
   // ─── Internal ───
   lastRequestTime = 0;
+  /**
+   * 429 이후 **클라이언트 전체**가 쉬어야 하는 시각(epoch ms).
+   *
+   * rate limit 은 요청 하나의 문제가 아니라 워크스페이스 전체에 걸린 신호다. 그러니
+   * 429 를 맞은 요청만 기다리게 두면 나머지 슬롯이 곧바로 다시 두드려 429 를 재생산한다.
+   * 슬롯을 붙잡아 남을 막는 대신, 다 같이 보는 이 게이트로 쉬게 한다.
+   */
+  cooldownUntil = 0;
+  /**
+   * 요청 1건을 rate limit 슬롯 안에서 실행하고, 재시도 가능한 실패는 백오프 후 다시 시도한다.
+   *
+   * 백오프 대기는 **슬롯을 놓은 뒤** 한다. 예전 구현은 `sema.acquire()` 안에서 재시도
+   * 전체(최대 60초 x 5회)를 돌려, 불운한 요청 하나가 동시성 한 칸을 최대 5분 점유했다.
+   * 동시성 기본값이 3이므로 그런 요청 3건이면 클라이언트 전체가 멈춘다. 게다가 재시도는
+   * 로그를 한 줄도 남기지 않아, 겉보기에는 죽은 프로세스와 구분되지 않았다 — 실제로
+   * 268페이지 pull 이 진행 로그가 멈춘 채 수 분씩 정지하는 것으로 나타났다(R9).
+   * 그래서 (1) 대기 중에는 슬롯을 반납하고, (2) 429 는 {@link cooldownUntil} 전역
+   * 게이트로 함께 쉬고, (3) 모든 재시도를 경고로 남긴다.
+   */
   async withRateLimit(fn) {
-    await this.sema.acquire();
-    try {
-      const now = Date.now();
-      const elapsed = now - this.lastRequestTime;
-      if (elapsed < this.minRequestInterval) {
-        await sleep(this.minRequestInterval - elapsed);
+    let backoffMs = 0;
+    for (let attempt = 0; ; attempt++) {
+      await this.sema.acquire();
+      try {
+        await this.waitForTurn();
+        this.lastRequestTime = Date.now();
+        return await fn();
+      } catch (error) {
+        if (!isRetryable(error) || attempt >= this.maxRetries) throw error;
+        const retryAfterMs = extractRetryAfter(error);
+        backoffMs = retryAfterMs !== null ? retryAfterMs * (1 + Math.random() * 0.25) : this.retryBaseDelayMs * Math.pow(this.retryBackoffFactor, attempt) * (0.5 + Math.random() * 0.5);
+        if (isRateLimited(error)) {
+          this.cooldownUntil = Math.max(this.cooldownUntil, Date.now() + backoffMs);
+        }
+        getLogger().warn(
+          `Notion API \uC7AC\uC2DC\uB3C4 ${attempt + 1}/${this.maxRetries} \u2014 ${Math.round(backoffMs)}ms \uB300\uAE30 (${describeRetryCause(error)})`
+        );
+      } finally {
+        this.sema.release();
       }
-      this.lastRequestTime = Date.now();
-      return await this.executeWithRetry(fn);
-    } finally {
-      this.sema.release();
+      await sleep(backoffMs);
     }
   }
-  async executeWithRetry(fn, attempt = 0) {
-    try {
-      return await fn();
-    } catch (error) {
-      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);
-      }
-      throw error;
-    }
+  /** 슬롯을 쥔 뒤의 발사 대기 — 전역 쿨다운(429)과 최소 요청 간격을 함께 지킨다. */
+  async waitForTurn() {
+    const cooldownMs = this.cooldownUntil - Date.now();
+    if (cooldownMs > 0) await sleep(cooldownMs);
+    const elapsed = Date.now() - this.lastRequestTime;
+    if (elapsed < this.minRequestInterval) await sleep(this.minRequestInterval - elapsed);
   }
 };
+function extractPropertyChoices(prop) {
+  const type = prop.type;
+  if (type !== "select" && type !== "multi_select" && type !== "status") return {};
+  const typeData = prop[type];
+  if (!typeData) return {};
+  const result = {};
+  if (typeData.options) {
+    result.options = typeData.options.map((o) => ({ id: o.id, name: o.name, color: o.color }));
+  }
+  if (typeData.groups) {
+    result.groups = typeData.groups.map((g) => ({
+      name: g.name,
+      color: g.color,
+      optionIds: g.option_ids
+    }));
+  }
+  return result;
+}
+function isRateLimited(error) {
+  return typeof error === "object" && error !== null && error.status === 429;
+}
 function isRetryable(error) {
   if (typeof error !== "object" || error === null) return false;
   const code = error.code;
@@ -1779,14 +1840,44 @@ function isRetryable(error) {
   const status = error.status;
   return status === 429 || status === 502 || status === 503 || status === 504;
 }
-function extractRetryAfter(error) {
-  if (typeof error === "object" && error !== null && "headers" in error) {
-    const headers = error.headers;
-    const retryAfter = headers?.["retry-after"];
-    if (retryAfter) return Number(retryAfter) * 1e3;
+function describeRetryCause(error) {
+  if (typeof error !== "object" || error === null) return String(error);
+  const e = error;
+  const parts = [];
+  if (typeof e.status === "number") parts.push(`status ${e.status}`);
+  if (typeof e.code === "string") parts.push(e.code);
+  if (typeof e.message === "string" && e.message) parts.push(e.message.slice(0, 120));
+  return parts.length > 0 ? parts.join(" \xB7 ") : "\uC54C \uC218 \uC5C6\uB294 \uC624\uB958";
+}
+var MAX_RETRY_AFTER_MS = 6e4;
+function readHeader(headers, name) {
+  if (typeof headers !== "object" || headers === null) return null;
+  const get = headers.get;
+  if (typeof get === "function") {
+    const value = get.call(headers, name);
+    return typeof value === "string" && value ? value : null;
+  }
+  for (const [key, value] of Object.entries(headers)) {
+    if (key.toLowerCase() !== name) continue;
+    return typeof value === "string" && value ? value : null;
   }
   return null;
 }
+function extractRetryAfter(error) {
+  if (typeof error !== "object" || error === null || !("headers" in error)) return null;
+  const raw = readHeader(error.headers, "retry-after");
+  if (!raw) return null;
+  const seconds = Number(raw);
+  let ms;
+  if (Number.isFinite(seconds)) {
+    ms = seconds * 1e3;
+  } else {
+    const at = Date.parse(raw);
+    ms = Number.isNaN(at) ? Number.NaN : at - Date.now();
+  }
+  if (!Number.isFinite(ms) || ms <= 0) return null;
+  return Math.min(ms, MAX_RETRY_AFTER_MS);
+}
 function sleep(ms) {
   return new Promise((resolve) => setTimeout(resolve, ms));
 }
@@ -2320,10 +2411,33 @@ function compactMarker(body) {
 }
 var TOGGLE_START = compactMarker("toggle:start");
 var TOGGLE_END = compactMarker("toggle:end");
+var TOGGLE_HEADING_START = compactMarker("toggle-heading");
+var TOGGLE_HEADING_END = compactMarker("toggle-heading:end");
+function calloutIndentMarker(depth) {
+  return compactMarker(`callout-indent:${depth}`);
+}
 var COLUMN_LIST_START = compactMarker("column-list:start");
 var COLUMN_LIST_END = compactMarker("column-list:end");
 var COLUMN_SEP = compactMarker("column");
+function columnMarker(ratio) {
+  return ratio ? compactMarker(`column:ratio=${ratio}`) : COLUMN_SEP;
+}
+function columnSepSource(ratio = "capture") {
+  const value = ratio === "capture" ? "([\\d.]+)" : "(?:[\\d.]+)";
+  return `%%${MARKER_BRAND}:column(?::ratio=${value})?%%`;
+}
+var COLUMN_SEP_SOURCE = columnSepSource("capture");
 var TOC_MARKER = compactMarker("toc");
+function tocMarker(color) {
+  return !color || color === "default" ? TOC_MARKER : compactMarker(`toc:color=${color}`);
+}
+function embedMarker(src) {
+  return compactMarker(`embed:src=${encodeURIComponent(src)}`);
+}
+function unknownMentionMarker(url, alt) {
+  const tail = alt ? `&alt=${encodeURIComponent(alt)}` : "";
+  return compactMarker(`unknown-mention:url=${encodeURIComponent(url)}${tail}`);
+}
 function syncedStartMarker(kind, url) {
   return compactMarker(`synced:start:kind=${kind}&url=${encodeURIComponent(url)}`);
 }
@@ -2342,7 +2456,13 @@ function blockColorMarker(color) {
   return compactMarker(`block-color:${color}`);
 }
 var PROPERTIES_TAG = `# ${MARKER_BRAND}:properties`;
+var MARKER_PAYLOAD_CHAR = "(?:[^\\n%]|%(?!%))";
+var MEDIA_PLACEHOLDER_HEAD = `>\\s*\u{1F4CE}\\s*${MARKER_PAYLOAD_CHAR}*(?:\\n>)?\\s*%%\\s*${MARKER_BRAND}:local-(?:image|file):`;
 var MARKER_BRAND_RE = MARKER_BRAND;
+var MARKER_TOKEN_RE = new RegExp(
+  `%%\\s*(?:${MARKER_BRAND_RE}:${MARKER_PAYLOAD_CHAR}*|/[A-Za-z][\\w-]*)\\s*%%`,
+  "g"
+);
 
 // src/converter/pipeline.ts
 var INLINE_DB_PROBE = new RegExp(`%% ${MARKER_BRAND_RE}:inline-db`);
@@ -2444,10 +2564,12 @@ function mapOutsideCodeFences(content, fn) {
   const lines = content.split("\n");
   const out = [];
   let buffer = [];
+  let bufferStart = 0;
+  let pos = 0;
   let fence = null;
   const flush = () => {
     if (buffer.length > 0) {
-      out.push(fn(buffer.join("\n")));
+      out.push(fn(buffer.join("\n"), bufferStart));
       buffer = [];
     }
   };
@@ -2457,23 +2579,78 @@ function mapOutsideCodeFences(content, fn) {
       flush();
       fence = fenceMatch[1][0].repeat(3);
       out.push(line);
-      continue;
-    }
-    if (fence !== null) {
+    } else if (fence !== null) {
       out.push(line);
       if (fenceMatch && fenceMatch[1].startsWith(fence)) {
         fence = null;
       }
-      continue;
+    } else {
+      if (buffer.length === 0) bufferStart = pos;
+      buffer.push(line);
     }
-    buffer.push(line);
+    pos += line.length + 1;
   }
   flush();
   return out.join("\n");
 }
+function mapOutsideInlineCode(content, fn) {
+  let out = "";
+  let plainStart = 0;
+  let i = 0;
+  while (i < content.length) {
+    if (content[i] !== "`") {
+      i += 1;
+      continue;
+    }
+    let run = 1;
+    while (content[i + run] === "`") run += 1;
+    const close = content.indexOf("`".repeat(run), i + run);
+    if (close === -1) {
+      i += run;
+      continue;
+    }
+    out += fn(content.slice(plainStart, i), plainStart);
+    out += content.slice(i, close + run);
+    i = close + run;
+    plainStart = i;
+  }
+  return out + fn(content.slice(plainStart), plainStart);
+}
+function mapOutsideCode(content, fn) {
+  return mapOutsideCodeFences(
+    content,
+    (segment, base) => mapOutsideInlineCode(segment, (text, inner) => fn(text, base + inner))
+  );
+}
+function mapOutsideMarkers(content, fn) {
+  const re = new RegExp(MARKER_TOKEN_RE.source, "g");
+  let out = "";
+  let last = 0;
+  let match;
+  while ((match = re.exec(content)) !== null) {
+    out += fn(content.slice(last, match.index), last);
+    out += match[0];
+    last = match.index + match[0].length;
+  }
+  return out + fn(content.slice(last), last);
+}
+
+// src/converter/marker-url.ts
+function encodeMarkerTarget(target) {
+  return encodeURIComponent(target).replace(/\(/g, "%28").replace(/\)/g, "%29");
+}
+function decodeMarkerTarget(encoded) {
+  try {
+    return decodeURIComponent(encoded);
+  } catch {
+    return encoded;
+  }
+}
+var MARKER_URL_CAPTURE = "((?:[^()\\s]|\\([^()]*\\))+)";
+var MARKER_LABEL_CAPTURE = "([^[\\]]+)";
 
 // src/converter/pre-processors/wikilink.ts
-var WIKILINK_REGEX2 = /(?<!!)\[\[([^\]|]+)(?:\|([^\]]+))?\]\]/g;
+var WIKILINK_REGEX2 = /(?<!!)\[\[([^[\]|]+)(?:\|([^[\]]+))?\]\]/g;
 var WikilinkResolver = class {
   constructor(resolve) {
     this.resolve = resolve;
@@ -2486,26 +2663,31 @@ var WikilinkResolver = class {
       return { content: input.content, metadata: input.metadata };
     }
     const preserveMarkers = input.metadata.preserveMarkers ? [...input.metadata.preserveMarkers] : [];
-    const resolved = input.content.replace(
-      WIKILINK_REGEX2,
-      (_match, target, display, offset) => {
-        const label = display ?? target;
-        if (this.resolve) {
-          const entry = this.resolve(target);
-          if (entry) {
-            return `<mention-page id="${entry.notionPageId}">${label}</mention-page>`;
+    const resolved = mapOutsideCode(
+      input.content,
+      (segment, base) => segment.replace(
+        WIKILINK_REGEX2,
+        (_match, target, display, offset) => {
+          const label = display ?? target;
+          if (this.resolve) {
+            const entry = this.resolve(target);
+            if (entry) {
+              if (display !== void 0 && display !== target) {
+                return `[${label}](https://www.notion.so/${entry.notionPageId.replace(/-/g, "")})`;
+              }
+              return `<mention-page id="${entry.notionPageId}">${label}</mention-page>`;
+            }
           }
+          const params = display ? { text: target, display } : { text: target };
+          params.__anchor = computeAnchor(input.content, base + offset);
+          preserveMarkers.push({
+            type: "wikilink",
+            params,
+            startIndex: base + offset
+          });
+          return `[${label}](${WIKILINK_PROTOCOL}${encodeMarkerTarget(target)})`;
         }
-        const params = display ? { text: target, display } : { text: target };
-        params.__anchor = computeAnchor(input.content, offset);
-        preserveMarkers.push({
-          type: "wikilink",
-          params,
-          startIndex: offset
-        });
-        const encodedTarget = encodeURIComponent(target);
-        return `[${label}](${WIKILINK_PROTOCOL}${encodedTarget})`;
-      }
+      )
     );
     return {
       content: resolved,
@@ -2587,7 +2769,8 @@ $$`;
 };
 
 // src/converter/pre-processors/embed.ts
-var OBSIDIAN_EMBED_REGEX = /!\[\[([^\]]+)\]\]/g;
+var OBSIDIAN_EMBED_REGEX = /((?:^[ \t]*(?:>[ \t]*)+)?[ \t]*)!\[\[([^[\]]+)\]\]([ \t]*)/gm;
+var QUOTE_LEAD = /^[ \t]*>/;
 var MARKDOWN_IMAGE_REGEX = /!\[([^\]]*)\]\(([^)]+)\)/g;
 var VIDEO_HOSTS = ["youtube.com", "youtu.be", "vimeo.com"];
 var EmbedResolver = class {
@@ -2596,24 +2779,23 @@ var EmbedResolver = class {
   process(input) {
     const images = input.metadata.images ? [...input.metadata.images] : [];
     const isPush = input.context.direction === "push";
-    let content = input.content.replace(OBSIDIAN_EMBED_REGEX, (_match, target) => {
-      if (isImageFile(target)) {
-        images.push({ url: target, localPath: target, isExternal: false });
-        if (isPush && !isExternalUrl(target)) {
-          const fileName = target.split("/").pop() ?? target;
-          return `> \u{1F4CE} ${fileName}
-> ${spacedMarker(`local-image:${target}`)}`;
+    let content = input.content.replace(
+      OBSIDIAN_EMBED_REGEX,
+      (match, lead, target, trail, offset, whole) => {
+        const span = { offset, length: match.length, whole, lead};
+        if (isImageFile(target)) {
+          images.push({ url: target, localPath: stripAlias(target), isExternal: false });
+          if (isPush && !isExternalUrl(target)) {
+            return isolate(placeholder("local-image", target), span);
+          }
+          return `${lead}![${target}](${encodeURI(target)})${trail}`;
         }
-        return `![${target}](${encodeURI(target)})`;
-      }
-      if (isPush && !isExternalUrl(target) && isAttachmentFile(target)) {
-        const fileName = target.split("/").pop() ?? target;
-        return `> \u{1F4CE} ${fileName}
-> ${spacedMarker(`local-file:${target}`)}`;
+        if (isPush && !isExternalUrl(target) && isAttachmentFile(target)) {
+          return isolate(placeholder("local-file", target), span);
+        }
+        return match;
       }
-      const encoded = encodeURIComponent(target);
-      return `[${target}](${EMBED_PROTOCOL}${encoded})`;
-    });
+    );
     content = content.replace(MARKDOWN_IMAGE_REGEX, (_match, alt, url) => {
       if (isVideoUrl(url)) {
         return `${spacedMarker(`embed:type=video&url=${encodeURIComponent(url)}`)}
@@ -2630,8 +2812,26 @@ var EmbedResolver = class {
     };
   }
 };
+function stripAlias(target) {
+  return target.split("|")[0];
+}
+function placeholder(kind, target) {
+  const fileName = stripAlias(target).split("/").pop() ?? target;
+  return `> \u{1F4CE} ${fileName} ${spacedMarker(`${kind}:${encodeMarkerTarget(target)}`)}`;
+}
+function isolate(text, span) {
+  const { offset, length, whole } = span;
+  const beforeOnLine = whole.slice(whole.lastIndexOf("\n", offset - 1) + 1, offset);
+  const afterIdx = offset + length;
+  const nl = whole.indexOf("\n", afterIdx);
+  const afterOnLine = whole.slice(afterIdx, nl === -1 ? whole.length : nl);
+  const tail = afterOnLine.trim() === "" ? "" : "\n\n";
+  if (QUOTE_LEAD.test(span.lead)) return `${offset === 0 ? "" : "\n"}${text}${tail}`;
+  const head = beforeOnLine.trim() === "" ? span.lead : "\n\n";
+  return `${head}${text}${tail}`;
+}
 function isImageFile(path) {
-  return /\.(png|jpg|jpeg|gif|svg|webp|bmp|ico)$/i.test(path);
+  return /\.(png|jpg|jpeg|gif|svg|webp|bmp|ico)$/i.test(stripAlias(path));
 }
 function isAttachmentFile(target) {
   const path = target.split("|")[0];
@@ -2800,20 +3000,20 @@ var CommentStripper = class {
     }
     const markers = input.metadata.preserveMarkers ? [...input.metadata.preserveMarkers] : [];
     const content = mapOutsideCodeFences(input.content, (segment) => {
-      const afterObsidian = segment.replace(
-        COMMENT_REGEX,
-        (match, body, offset) => {
+      const afterObsidian = mapOutsideMarkers(
+        segment,
+        (plain, base) => plain.replace(COMMENT_REGEX, (match, body, offset) => {
           const trimmed = body.trimStart();
           if (trimmed.startsWith(`${MARKER_BRAND}:`) || trimmed.startsWith("/")) {
             return match;
           }
           markers.push({
             type: "comment",
-            params: { text: body, __anchor: computeAnchor(segment, offset) },
-            startIndex: offset
+            params: { text: body, __anchor: computeAnchor(segment, base + offset) },
+            startIndex: base + offset
           });
           return "";
-        }
+        })
       );
       return afterObsidian.replace(HTML_COMMENT_REGEX, (_match, body, offset) => {
         markers.push({
@@ -2917,19 +3117,34 @@ var TableAlignmentGuard = class {
   }
 };
 
+// src/utils/wikilink-title.ts
+function wikilinkTitleFromPath(obsidianPath) {
+  return obsidianPath.replace(/\.md$/i, "").split("/").pop() ?? "";
+}
+function formatWikilink(target, label) {
+  return label === void 0 || label === target ? `[[${target}]]` : `[[${target}|${label}]]`;
+}
+
 // src/converter/link-restore.ts
-var NOTION_LINK_REGEX = /\[([^\]]+)\]\((?:https:\/\/(?:www\.)?notion\.so\/|notion:\/\/)([a-f0-9-]+)\)/g;
-var WIKILINK_PRESERVE_REGEX = new RegExp(`\\[([^\\]]+)\\]\\(${WIKILINK_PROTOCOL}([^)]+)\\)`, "g");
-var EMBED_PRESERVE_REGEX = new RegExp(`\\[([^\\]]+)\\]\\(${EMBED_PROTOCOL}([^)]+)\\)`, "g");
+var NOTION_LINK_REGEX = new RegExp(
+  `\\[${MARKER_LABEL_CAPTURE}\\]\\((?:https:\\/\\/(?:www\\.)?notion\\.so\\/|notion:\\/\\/)([a-f0-9-]+)\\)`,
+  "g"
+);
+var WIKILINK_PRESERVE_REGEX = new RegExp(
+  `\\[${MARKER_LABEL_CAPTURE}\\]\\(${WIKILINK_PROTOCOL}${MARKER_URL_CAPTURE}\\)`,
+  "g"
+);
+var EMBED_PRESERVE_REGEX = new RegExp(
+  `\\[${MARKER_LABEL_CAPTURE}\\]\\(${EMBED_PROTOCOL}${MARKER_URL_CAPTURE}\\)`,
+  "g"
+);
 function restoreLinkMarkers(text) {
   let out = text.replace(NOTION_LINK_REGEX, (_match, display) => `[[${display}]]`);
   out = out.replace(WIKILINK_PRESERVE_REGEX, (_match, display, encodedTarget) => {
-    const target = decodeURIComponent(encodedTarget);
-    return target === display ? `[[${target}]]` : `[[${target}|${display}]]`;
+    return formatWikilink(decodeMarkerTarget(encodedTarget), display);
   });
   out = out.replace(EMBED_PRESERVE_REGEX, (_match, _display, encodedTarget) => {
-    const target = decodeURIComponent(encodedTarget);
-    return `![[${target}]]`;
+    return `![[${decodeMarkerTarget(encodedTarget)}]]`;
   });
   return out;
 }
@@ -3096,7 +3311,8 @@ var PreserveMarkerInjector = class {
       }
       case "local-image":
       case "local-file": {
-        const target = params.__raw ?? params.path;
+        const raw = params.__raw ?? params.path;
+        const target = raw !== void 0 ? decodeMarkerTarget(raw) : void 0;
         return target ? content.includes(`![[${target}]]`) : false;
       }
       case "table-align":
@@ -3177,8 +3393,8 @@ var CalloutRestorer = class {
     };
   }
 };
-function escapeRegex(str) {
-  return str.replace(/[.*+?^${}()|[\]\\]/g, "\\$&");
+function escapeRegex(str2) {
+  return str2.replace(/[.*+?^${}()|[\]\\]/g, "\\$&");
 }
 
 // src/converter/post-processors/color-annotator.ts
@@ -3265,7 +3481,7 @@ function normalizeDate(dateStr) {
 
 // src/converter/post-processors/local-image-restorer.ts
 var LOCAL_IMAGE_MARKER_REGEX = new RegExp(
-  `>\\s*\u{1F4CE}\\s*[^\\n]*\\n>\\s*%%\\s*${MARKER_BRAND_RE}:local-(?:image|file):([^\\s]+)\\s*%%`,
+  `${MEDIA_PLACEHOLDER_HEAD}(${MARKER_PAYLOAD_CHAR}+?)\\s*%%`,
   "g"
 );
 var LocalImageRestorer = class {
@@ -3276,7 +3492,7 @@ var LocalImageRestorer = class {
       return { content: input.content, metadata: input.metadata };
     }
     const content = input.content.replace(LOCAL_IMAGE_MARKER_REGEX, (_match, target) => {
-      return `![[${target}]]`;
+      return `![[${decodeMarkerTarget(target)}]]`;
     });
     return { content, metadata: input.metadata };
   }
@@ -3377,6 +3593,229 @@ function stripQuotes(s) {
   return s;
 }
 
+// src/converter/container-indent.ts
+var CONTAINER_PREFIX_SOURCE = "[\\t ]*(?:>[\\t ]*)*";
+var CONTAINER_PREFIX_RE = new RegExp(`^${CONTAINER_PREFIX_SOURCE}`);
+function nfmOpenTagSource(name, attrs = "ignore") {
+  return `<${name}${attrs === "capture" ? "(\\s[^>]*|)" : "(?:\\s[^>]*)?"}>`;
+}
+function splitContainerPrefix(line) {
+  const prefix = CONTAINER_PREFIX_RE.exec(line)?.[0] ?? "";
+  return { prefix, body: line.slice(prefix.length) };
+}
+function dedentContainerBody(text) {
+  const lines = text.split("\n");
+  while (lines.length && lines[0].trim() === "") lines.shift();
+  while (lines.length && lines[lines.length - 1].trim() === "") lines.pop();
+  const blocks = scanContainerBlocks(lines);
+  const kinds = kindsOf(lines, blocks);
+  const widened = widenAmbiguousFences(lines, blocks);
+  let min = Infinity;
+  lines.forEach((l, i) => {
+    if (kinds[i] !== "prose" || l.trim() === "") return;
+    min = Math.min(min, /^[\t ]*/.exec(l)[0].length);
+  });
+  if (!Number.isFinite(min)) min = 0;
+  return lines.map((l, i) => {
+    if (l.trim() === "") return "";
+    if (kinds[i] === "code") return l;
+    if (kinds[i] === "fence") {
+      const flat = l.replace(/^[\t ]+/, "");
+      const bar = widened.get(i);
+      return bar === void 0 ? flat : flat.replace(/`{3,}|~{3,}/, bar);
+    }
+    return l.slice(min);
+  }).join("\n");
+}
+function indentContainerBody(text, indent = "	") {
+  const lines = text.split("\n");
+  const kinds = classifyContainerLines(lines);
+  return lines.map((line, i) => line === "" || kinds[i] === "code" ? line : indent + line).join("\n");
+}
+function stripContainerIndent(text, indent) {
+  if (indent === "") return text;
+  return text.split("\n").map((line) => line.startsWith(indent) ? line.slice(indent.length) : line).join("\n");
+}
+var TABLE_OPEN_LINE_RE = new RegExp(`^[\\t ]*${nfmOpenTagSource("table")}`);
+var FENCE_LINE_RE = /^([\t ]*)(`{3,}|~{3,})(.*)$/;
+function matchFence(line) {
+  const m = FENCE_LINE_RE.exec(line);
+  return m ? { indent: m[1], char: m[2][0], len: m[2].length, info: m[3] } : null;
+}
+function findFenceClose(lines, start, open) {
+  let loose = null;
+  for (let j = start + 1; j < lines.length; j++) {
+    const f = matchFence(lines[j]);
+    if (!f || f.char !== open.char || f.len < open.len || f.info.trim() !== "") continue;
+    if (f.indent === open.indent) return j;
+    loose ??= j;
+  }
+  return loose;
+}
+function scanContainerBlocks(lines) {
+  const blocks = [];
+  for (let i = 0; i < lines.length; i++) {
+    const fence = matchFence(lines[i]);
+    if (fence) {
+      const close2 = findFenceClose(lines, i, fence);
+      blocks.push({ type: "code", open: i, close: close2, fence });
+      i = close2 ?? lines.length;
+      continue;
+    }
+    if (!TABLE_OPEN_LINE_RE.test(lines[i])) continue;
+    if (/<\/table>/.test(lines[i])) {
+      blocks.push({ type: "table", open: i, close: i });
+      continue;
+    }
+    let close = null;
+    for (let j = i + 1; j < lines.length; j++) {
+      if (!/<\/table>/.test(lines[j])) continue;
+      close = j;
+      break;
+    }
+    blocks.push({ type: "table", open: i, close });
+    i = close ?? lines.length;
+  }
+  return blocks;
+}
+function kindsOf(lines, blocks) {
+  const kinds = lines.map(() => "prose");
+  for (const b of blocks) {
+    kinds[b.open] = "fence";
+    const end = b.close ?? lines.length;
+    for (let j = b.open + 1; j < end; j++) kinds[j] = "code";
+    if (b.close !== null && b.close !== b.open) kinds[b.close] = "fence";
+  }
+  return kinds;
+}
+function widenAmbiguousFences(lines, blocks) {
+  const widened = /* @__PURE__ */ new Map();
+  for (const b of blocks) {
+    if (b.type !== "code" || !b.fence) continue;
+    const end = b.close ?? lines.length;
+    let longest = 0;
+    for (let j = b.open + 1; j < end; j++) {
+      const f = matchFence(lines[j]);
+      if (f?.char === b.fence.char) longest = Math.max(longest, f.len);
+    }
+    if (longest < b.fence.len) continue;
+    const bar = b.fence.char.repeat(longest + 1);
+    widened.set(b.open, bar);
+    if (b.close !== null) widened.set(b.close, bar);
+  }
+  return widened;
+}
+function codeInteriorRanges(text) {
+  const lines = text.split("\n");
+  const kinds = classifyContainerLines(lines.map((l) => splitContainerPrefix(l).body));
+  const ranges = [];
+  let offset = 0;
+  let start = null;
+  lines.forEach((line, i) => {
+    if (kinds[i] === "code" && start === null) start = offset;
+    else if (kinds[i] !== "code" && start !== null) {
+      ranges.push([start, offset]);
+      start = null;
+    }
+    offset += line.length + 1;
+  });
+  if (start !== null) ranges.push([start, offset]);
+  return ranges;
+}
+function isInsideRanges(ranges, offset) {
+  return ranges.some(([start, end]) => offset >= start && offset < end);
+}
+function classifyContainerLines(lines) {
+  return kindsOf(lines, scanContainerBlocks(lines));
+}
+function containerBlockEnds(lines) {
+  const ends = lines.map((_, i) => i);
+  for (const b of scanContainerBlocks(lines)) {
+    const end = b.close ?? lines.length - 1;
+    for (let j = b.open; j <= end; j++) ends[j] = end;
+  }
+  return ends;
+}
+
+// src/converter/callout-indent.ts
+var CLAMPED_INDENT = "  ";
+var CODE_INDENT_WIDTH = 4;
+var INDENTED_QUOTE_RE = /^([\t ]+)>/;
+var CALLOUT_HEAD_RE = /^> \[!\w+\][-+]?/;
+var CALLOUT_INDENT_MARKER_RE = new RegExp(`\\s*%%${MARKER_BRAND_RE}:callout-indent:(\\d+)%%`);
+function visualWidth(ws) {
+  let width = 0;
+  for (const ch of ws)
+    width = ch === "	" ? width + CODE_INDENT_WIDTH - width % CODE_INDENT_WIDTH : width + 1;
+  return width;
+}
+function clampCalloutIndent(content) {
+  const lines = content.split("\n");
+  const kinds = classifyContainerLines(lines);
+  const out = [];
+  for (let i = 0; i < lines.length; i++) {
+    const indent = kinds[i] === "prose" ? INDENTED_QUOTE_RE.exec(lines[i])?.[1] ?? null : null;
+    if (indent === null || visualWidth(indent) < CODE_INDENT_WIDTH) {
+      out.push(lines[i]);
+      continue;
+    }
+    let end = i;
+    while (end + 1 < lines.length && kinds[end + 1] === "prose" && lines[end + 1].startsWith(`${indent}>`)) {
+      end++;
+    }
+    const depth = Math.floor(visualWidth(indent) / CODE_INDENT_WIDTH);
+    const head = lines[i].slice(indent.length);
+    const marked = depth > 1 && CALLOUT_HEAD_RE.test(head) ? `${head} ${calloutIndentMarker(depth)}` : head;
+    out.push(CLAMPED_INDENT + marked);
+    for (let j = i + 1; j <= end; j++) out.push(CLAMPED_INDENT + lines[j].slice(indent.length));
+    i = end;
+  }
+  return out.join("\n");
+}
+var BODY_INDENT_RE = /^\t+(?![ \t]*(?:[-*+]|\d+[.)])\s)/;
+function clampBodyIndent(line) {
+  return line.replace(BODY_INDENT_RE, CLAMPED_INDENT);
+}
+var QUOTE_RUN_RE = /^(?:>[\t ]?)*/;
+function inheritedQuoteRun(lines, i) {
+  const runOf = (step) => {
+    for (let j = i + step; j >= 0 && j < lines.length; j += step) {
+      if (lines[j].trim() === "") continue;
+      return (QUOTE_RUN_RE.exec(lines[j])?.[0] ?? "").trimEnd();
+    }
+    return null;
+  };
+  const runs = [runOf(-1), runOf(1)].filter((r) => r !== null);
+  return runs.length === 0 ? "" : runs.reduce((a, b) => a.length <= b.length ? a : b);
+}
+function quoteCalloutBody(body) {
+  const lines = body.split("\n");
+  const kinds = classifyContainerLines(lines);
+  return lines.map((line, i) => {
+    if (!line.trim()) {
+      const run = inheritedQuoteRun(lines, i);
+      return run ? `> ${run}` : ">";
+    }
+    return `> ${kinds[i] === "prose" ? clampBodyIndent(line) : line}`;
+  }).join("\n");
+}
+var RESTORE_BODY_INDENT_RE = new RegExp(`^${CLAMPED_INDENT}`);
+function restoreBodyIndent(body) {
+  const lines = body.split("\n");
+  const kinds = classifyContainerLines(lines);
+  return lines.map((line, i) => kinds[i] === "prose" ? line.replace(RESTORE_BODY_INDENT_RE, "	") : line).join("\n");
+}
+function readCalloutIndentDepth(indent, title) {
+  const match = CALLOUT_INDENT_MARKER_RE.exec(title);
+  if (match) {
+    return { depth: Number(match[1]), title: title.replace(CALLOUT_INDENT_MARKER_RE, "") };
+  }
+  return { depth: indent === "" ? 0 : 1, title };
+}
+function applyCalloutIndent(block, depth) {
+  return depth > 0 ? indentContainerBody(block, "	".repeat(depth)) : block;
+}
+
 // src/converter/post-processors/block-spacer.ts
 var BlockSpacer = class {
   name = "BlockSpacer";
@@ -3452,7 +3891,7 @@ function respace(content, sourceCompact) {
       fence = "math";
       continue;
     }
-    const line = LIST_ITEM_RE.test(raw) || INDENTED_CONTINUATION_RE.test(raw) ? raw.replace(/^\t+/, (t) => "    ".repeat(t.length)) : raw;
+    const line = QUOTE_RE.test(raw) ? raw.replace(/^\t+/, CLAMPED_INDENT) : LIST_ITEM_RE.test(raw) || INDENTED_CONTINUATION_RE.test(raw) ? raw.replace(/^\t+/, (t) => "    ".repeat(t.length)) : raw;
     if (BRAND_MARKER_LINE_RE.test(line) && blocks.length > 0) {
       appendToLast(line);
       continue;
@@ -3463,6 +3902,9 @@ function respace(content, sourceCompact) {
       continue;
     }
     if (last()?.kind === "list" && INDENTED_CONTINUATION_RE.test(line)) {
+      if (QUOTE_RE.test(line) && (atBoundary || CALLOUT_START_RE.test(line))) {
+        appendToLast("");
+      }
       appendToLast(line);
       continue;
     }
@@ -3600,6 +4042,7 @@ function formatMention(mention, plainText) {
 }
 
 // src/converter/block-converter.ts
+var TOC_COLOR_MARKER_RE = new RegExp(`^%%${MARKER_BRAND}:toc:color=([a-z_]+)%%$`);
 var TRULY_UNSUPPORTED_BLOCK_TYPES = ["unsupported", "template"];
 var DIVIDER_PLACEHOLDER = "\u200B%%IM-NOBSIDIAN_DIVIDER%%\u200B";
 var VIDEO_URL_PATTERNS = [
@@ -3621,8 +4064,8 @@ var EMBED_URL_PATTERNS = [
   /^https?:\/\/(www\.)?spotify\.com\//,
   /^https?:\/\/(www\.)?soundcloud\.com\//
 ];
-function escapeRegex2(str) {
-  return str.replace(/[.*+?^${}()|[\]\\]/g, "\\$&");
+function escapeRegex2(str2) {
+  return str2.replace(/[.*+?^${}()|[\]\\]/g, "\\$&");
 }
 var BlockConverter = class {
   n2m = null;
@@ -3972,9 +4415,9 @@ ${COLUMN_LIST_END}`;
       const content = result.slice(match.index + match[0].length + 1, endMatch.index).trimEnd();
       const id = this.toggleCounter++;
       this.toggleContents.set(id, content);
-      const placeholder = `%%IM-NOBSIDIAN_TOGGLE_${id}%%`;
-      result = result.slice(0, match.index) + placeholder + result.slice(endMatch.index + endMatch[0].length);
-      startRe.lastIndex = match.index + placeholder.length;
+      const placeholder2 = `%%IM-NOBSIDIAN_TOGGLE_${id}%%`;
+      result = result.slice(0, match.index) + placeholder2 + result.slice(endMatch.index + endMatch[0].length);
+      startRe.lastIndex = match.index + placeholder2.length;
     }
     return result;
   }
@@ -3988,12 +4431,12 @@ ${COLUMN_LIST_END}`;
       const endMatch = endRe.exec(result);
       if (!endMatch) break;
       const inner = result.slice(match.index + match[0].length + 1, endMatch.index);
-      const columns = inner.split(new RegExp(`^${escapeRegex2(COLUMN_SEP)}$`, "m")).map((c) => c.trim()).filter(Boolean);
+      const columns = inner.split(new RegExp(`^${columnSepSource("ignore")}$`, "m")).map((c) => c.trim()).filter(Boolean);
       const id = this.columnCounter++;
       this.columnContents.set(id, columns);
-      const placeholder = `%%IM-NOBSIDIAN_COLLIST_${id}%%`;
-      result = result.slice(0, match.index) + placeholder + result.slice(endMatch.index + endMatch[0].length);
-      startRe.lastIndex = match.index + placeholder.length;
+      const placeholder2 = `%%IM-NOBSIDIAN_COLLIST_${id}%%`;
+      result = result.slice(0, match.index) + placeholder2 + result.slice(endMatch.index + endMatch[0].length);
+      startRe.lastIndex = match.index + placeholder2.length;
     }
     return result;
   }
@@ -4087,8 +4530,9 @@ ${COLUMN_LIST_END}`;
     const texts = para?.rich_text ?? [];
     if (texts.length !== 1) return null;
     const text = (texts[0]?.text?.content ?? "").trim();
-    if (text === TOC_MARKER) {
-      return NotionBlockBuilder.tableOfContents();
+    const toc = TOC_COLOR_MARKER_RE.exec(text);
+    if (text === TOC_MARKER || toc) {
+      return NotionBlockBuilder.tableOfContents(toc?.[1]);
     }
     if (text === BREADCRUMB_MARKER) {
       return NotionBlockBuilder.breadcrumb();
@@ -4341,14 +4785,43 @@ function collectAllDescendants(blocks) {
   }
   return result;
 }
-var IMAGE_EXTENSIONS = {
-  "image/png": ".png",
-  "image/jpeg": ".jpg",
-  "image/gif": ".gif",
-  "image/webp": ".webp",
-  "image/svg+xml": ".svg",
-  "image/bmp": ".bmp",
-  "image/tiff": ".tiff"
+
+// src/utils/mime.ts
+var EXTENSION_TO_BLOCK_TYPE = {
+  ".png": "image",
+  ".jpg": "image",
+  ".jpeg": "image",
+  ".gif": "image",
+  ".svg": "image",
+  ".webp": "image",
+  ".ico": "image",
+  ".bmp": "image",
+  ".tiff": "image",
+  ".tif": "image",
+  ".avif": "image",
+  ".apng": "image",
+  ".heic": "image",
+  ".pdf": "pdf",
+  ".mp4": "video",
+  ".mov": "video",
+  ".webm": "video",
+  ".avi": "video",
+  ".mkv": "video",
+  ".flv": "video",
+  ".wmv": "video",
+  ".m4v": "video",
+  ".mpeg": "video",
+  ".ogv": "video",
+  ".3gp": "video",
+  ".mp3": "audio",
+  ".wav": "audio",
+  ".ogg": "audio",
+  ".m4a": "audio",
+  ".flac": "audio",
+  ".aac": "audio",
+  ".wma": "audio",
+  ".opus": "audio",
+  ".weba": "audio"
 };
 var EXTENSION_TO_MIME = {
   ".png": "image/png",
@@ -4359,18 +4832,81 @@ var EXTENSION_TO_MIME = {
   ".svg": "image/svg+xml",
   ".bmp": "image/bmp",
   ".ico": "image/x-icon",
-  ".tiff": "image/tiff"
+  ".tiff": "image/tiff",
+  ".tif": "image/tiff",
+  ".avif": "image/avif",
+  ".heic": "image/heic",
+  ".pdf": "application/pdf",
+  ".mp4": "video/mp4",
+  ".mov": "video/quicktime",
+  ".webm": "video/webm",
+  ".avi": "video/x-msvideo",
+  ".mkv": "video/x-matroska",
+  ".mp3": "audio/mpeg",
+  ".wav": "audio/wav",
+  ".ogg": "audio/ogg",
+  ".m4a": "audio/mp4",
+  ".flac": "audio/flac",
+  ".aac": "audio/aac",
+  ".docx": "application/vnd.openxmlformats-officedocument.wordprocessingml.document",
+  ".xlsx": "application/vnd.openxmlformats-officedocument.spreadsheetml.sheet",
+  ".pptx": "application/vnd.openxmlformats-officedocument.presentationml.presentation",
+  ".zip": "application/zip",
+  ".gz": "application/gzip",
+  ".tar": "application/x-tar",
+  ".rar": "application/vnd.rar",
+  ".7z": "application/x-7z-compressed",
+  ".py": "text/x-python",
+  ".js": "text/javascript",
+  ".ts": "text/typescript",
+  ".json": "application/json",
+  ".csv": "text/csv",
+  ".txt": "text/plain",
+  ".html": "text/html",
+  ".xml": "application/xml",
+  ".hwp": "application/x-hwp",
+  ".xls": "application/vnd.ms-excel",
+  ".doc": "application/msword",
+  ".ppt": "application/vnd.ms-powerpoint"
 };
-function scanMarkdownLinks(markdown) {
-  const spans = [];
-  let i = 0;
-  while (i < markdown.length) {
-    const open = markdown.indexOf("[", i);
-    if (open === -1) break;
-    if (markdown[open - 1] === "\\") {
-      i = open + 1;
-      continue;
-    }
+function getBlockType(filename) {
+  const ext = filename.match(/\.[^.]+$/)?.[0]?.toLowerCase();
+  if (!ext) return "file";
+  return EXTENSION_TO_BLOCK_TYPE[ext] ?? "file";
+}
+function getMimeType(filename) {
+  const ext = filename.match(/\.[^.]+$/)?.[0]?.toLowerCase();
+  if (!ext) return "application/octet-stream";
+  return EXTENSION_TO_MIME[ext] ?? "application/octet-stream";
+}
+
+// src/utils/download-fetch.ts
+var DEFAULT_DOWNLOAD_TIMEOUT_MS = 3e5;
+function fetchForDownload(fetchFn, url, timeoutMs = DEFAULT_DOWNLOAD_TIMEOUT_MS) {
+  if (timeoutMs <= 0) return fetchFn(url);
+  return fetchFn(url, { signal: AbortSignal.timeout(timeoutMs) });
+}
+
+// src/sync/image-handler.ts
+var IMAGE_EXTENSIONS = {
+  "image/png": ".png",
+  "image/jpeg": ".jpg",
+  "image/gif": ".gif",
+  "image/webp": ".webp",
+  "image/svg+xml": ".svg",
+  "image/bmp": ".bmp",
+  "image/tiff": ".tiff"
+};
+function scanMarkdownLinks(markdown) {
+  const spans = [];
+  let i = 0;
+  while (i < markdown.length) {
+    const open = markdown.indexOf("[", i);
+    if (open === -1) break;
+    if (markdown[open - 1] === "\\") {
+      i = open + 1;
+      continue;
+    }
     const isEmbed = markdown[open - 1] === "!" && markdown[open - 2] !== "\\";
     let depth = 1;
     let j = open + 1;
@@ -4430,18 +4966,44 @@ function toWikilinkAlias(label) {
 }
 var INTERNAL_FILE_URL_RE = /^file:\/\/%7B.*%7D%7D$/;
 var FILE_LABEL_PREFIX_RE = /^(?:📎|🎬|🎞|📄|🔊)\s*/u;
-var LOCAL_MARKER_RE = new RegExp(`${MARKER_BRAND_RE}:local-(?:image|file):([^\\s%]+)`, "g");
+var LOCAL_MARKER_RE = new RegExp(
+  `${MARKER_BRAND_RE}:local-(?:image|file):(${MARKER_PAYLOAD_CHAR}+?)\\s*%%`,
+  "g"
+);
+var PLACEHOLDER_MARKER_RE = new RegExp(
+  `${MARKER_BRAND_RE}:local-(image|file):(${MARKER_PAYLOAD_CHAR}+?)\\s*%%`,
+  "u"
+);
+function stripAlias2(target) {
+  return target.split("|")[0];
+}
+function uploadedFileNameFromUrl(url) {
+  try {
+    return decodeURIComponent(new URL(url).pathname.split("/").pop() ?? "");
+  } catch {
+    return "";
+  }
+}
+var NON_DESCENDABLE_TYPES = /* @__PURE__ */ new Set(["child_page", "child_database", "synced_block", "table"]);
 function collectLocalMarkerBasenames(markdown) {
   const names = /* @__PURE__ */ new Set();
   const unescaped = markdown.replace(/\\/g, "");
   for (const m of unescaped.matchAll(LOCAL_MARKER_RE)) {
-    names.add(baseName(m[1]));
+    names.add(baseName(decodeMarkerTarget(m[1])));
   }
   return names;
 }
 function baseName(path) {
   return path.split("/").pop() ?? path;
 }
+function folderOf(notePath) {
+  return notePath?.includes("/") ? notePath.slice(0, notePath.lastIndexOf("/")) : void 0;
+}
+function plainTextOf(block) {
+  const body = block[block.type];
+  if (!body?.rich_text) return "";
+  return body.rich_text.map((r) => r.plain_text ?? "").join("");
+}
 var ImageHandler = class {
   constructor(vaultFs, attachmentFolder = "attachments", notionClient, customFetch, options, stateDb) {
     this.vaultFs = vaultFs;
@@ -4453,6 +5015,7 @@ var ImageHandler = class {
     this.maxRetries = options?.maxRetries ?? 3;
     this.retryBaseMs = options?.retryBaseMs ?? 1e3;
     this.maxFileSizeBytes = options?.maxFileSizeBytes ?? 100 * 1024 * 1024;
+    this.downloadTimeoutMs = options?.downloadTimeoutMs ?? DEFAULT_DOWNLOAD_TIMEOUT_MS;
   }
   vaultFs;
   attachmentFolder;
@@ -4463,9 +5026,14 @@ var ImageHandler = class {
   maxRetries;
   retryBaseMs;
   maxFileSizeBytes;
+  downloadTimeoutMs;
   get fetchFn() {
     return this.customFetch ?? globalThis.fetch;
   }
+  /** 상한 로직은 첨부 경로와 공유한다 — 한쪽만 빠뜨리지 않도록(utils/download-fetch). */
+  fetchForDownload(url) {
+    return fetchForDownload(this.fetchFn, url, this.downloadTimeoutMs);
+  }
   async downloadImage(url, pageTitle) {
     return this.persistImage(await this.fetchImage(url, pageTitle));
   }
@@ -4480,7 +5048,7 @@ var ImageHandler = class {
             `[Im-Nobsidian] \uC774\uBBF8\uC9C0 \uB2E4\uC6B4\uB85C\uB4DC \uC7AC\uC2DC\uB3C4 (${attempt + 1}/${maxRetries}): ${pageTitle}`
           );
         }
-        const response = await this.fetchFn(url);
+        const response = await this.fetchForDownload(url);
         if (!response.ok) {
           throw new Error(`\uC774\uBBF8\uC9C0 \uB2E4\uC6B4\uB85C\uB4DC \uC2E4\uD328: ${response.status} ${response.statusText}`);
         }
@@ -4499,6 +5067,31 @@ var ImageHandler = class {
     }
     throw lastError;
   }
+  /**
+   * 캡션이 push 가 적어 둔 원본 임베드 대상인지 판정한다(R1). 맞으면 그 문자열을
+   * 그대로 돌려주고, 호출자는 사본을 내려받는 대신 `![[원본]]` 으로 되살린다.
+   *
+   * 사용자가 Notion 에서 손으로 쓴 캡션을 경로로 오인하면 깨진 위키링크가 되므로,
+   * ① 파일명이 실제 업로드된 파일명과 같고 ② 볼트에 그 파일이 실재할 때만 인정한다.
+   * 둘 중 하나라도 어긋나면 null 을 돌려 기존 다운로드 경로로 떨어진다.
+   *
+   * ②의 실재 확인은 push 와 **같은 후보 사다리**(노트 폴더 → 루트 → attachments/)를
+   * 쓴다 — 위키링크는 파일명만 적는 게 관례라 볼트 루트만 보면 노트 옆 파일을 놓친다.
+   */
+  async resolveOriginalTarget(label, uploadedName, noteFolder) {
+    if (!label || !uploadedName) return null;
+    const target = label.replace(FILE_LABEL_PREFIX_RE, "").replace(/\\(.)/g, "$1").trim();
+    if (!target || /^https?:\/\//.test(target) || target.includes("\n")) return null;
+    const vaultPath = stripAlias2(target);
+    if (baseName(vaultPath) !== uploadedName) return null;
+    for (const candidate of this.vaultCandidates(vaultPath, noteFolder)) {
+      try {
+        if (await this.vaultFs.exists(candidate)) return target;
+      } catch {
+      }
+    }
+    return null;
+  }
   async persistImage(fetched) {
     await this.vaultFs.ensureFolder(this.attachmentFolder);
     await this.vaultFs.writeBinary(fetched.localPath, fetched.buffer);
@@ -4509,7 +5102,8 @@ var ImageHandler = class {
       size: fetched.buffer.length
     };
   }
-  async downloadAllImages(markdown, pageTitle, pageId) {
+  async downloadAllImages(markdown, pageTitle, pageId, notePath) {
+    const noteFolder = folderOf(notePath);
     const embeds = scanMarkdownLinks(markdown).filter((s) => s.isEmbed);
     const notionMatches = embeds.filter(
       (s) => /^https?:\/\//.test(s.url) && this.isNotionImageUrl(s.url)
@@ -4561,6 +5155,15 @@ var ImageHandler = class {
         result = result.replace(span.full, "");
         continue;
       }
+      const original = await this.resolveOriginalTarget(
+        span.label,
+        uploadedFileNameFromUrl(span.url),
+        noteFolder
+      );
+      if (original) {
+        result = result.replace(span.full, `![[${original}]]`);
+        continue;
+      }
       const download = await this.persistImage(fetched);
       downloads.push(download);
       const alias = toWikilinkAlias(span.label);
@@ -4582,6 +5185,15 @@ var ImageHandler = class {
           result = result.replace(span.full, "");
           continue;
         }
+        const original = await this.resolveOriginalTarget(
+          span.label,
+          parsed.fileName || uploadedFileNameFromUrl(realUrl),
+          noteFolder
+        );
+        if (original) {
+          result = result.replace(span.full, `![[${original}]]`);
+          continue;
+        }
         const download = await this.persistImage(fetched);
         downloads.push(download);
         const alias = toWikilinkAlias(span.label);
@@ -4601,7 +5213,7 @@ var ImageHandler = class {
     }
     const { buffer, resolvedPath } = await this.readImageFromVault(localPath, noteFolder);
     const filename = localPath.split("/").pop() ?? "image.png";
-    const contentType = this.getContentTypeFromPath(filename);
+    const contentType = getMimeType(filename);
     const blob = new Blob([buffer], { type: contentType });
     const fileUploadId = await this.notionClient.uploadFile(blob, filename, contentType);
     const fileHash = createHash("sha256").update(buffer).digest("hex");
@@ -4611,7 +5223,7 @@ var ImageHandler = class {
     if (!this.notionClient) return [];
     const localImages = images.filter((img) => !img.isExternal && img.localPath);
     if (localImages.length === 0) return [];
-    const noteFolder = notePath?.includes("/") ? notePath.slice(0, notePath.lastIndexOf("/")) : void 0;
+    const noteFolder = folderOf(notePath);
     const results = [];
     const imageBlocks = [];
     for (const img of localImages) {
@@ -4635,36 +5247,150 @@ var ImageHandler = class {
     }
     if (imageBlocks.length > 0) {
       await this.notionClient.appendChildren(pageId, imageBlocks);
-      if (this.stateDb) {
-        for (const r of results) {
-          try {
-            this.stateDb.registerFile({
-              localPath: r.localPath,
-              notionPageId: pageId,
-              fileUploadId: r.fileUploadId,
-              fileType: "image",
-              fileHash: r.fileHash,
-              fileSize: r.fileSize
-            });
-          } catch (error) {
-            getLogger().warn(`\uC774\uBBF8\uC9C0 \uB808\uC9C0\uC2A4\uD2B8\uB9AC \uB4F1\uB85D \uC2E4\uD328 (${r.localPath}):`, error);
+      this.registerUploads(pageId, results);
+    }
+    return results;
+  }
+  /**
+   * push 가 심어 둔 자리표시자 quote 를 **제자리에서** 실제 image/file 블록으로 바꾼다(R1).
+   *
+   * 그 전에는 임베드 하나가 Notion 에서 두 조각으로 갈라졌다 — 본문 자리에는
+   * `> 📎 foo.png` + `%% im-nobsidian:local-image:… %%` 리터럴 마커가, 실제 이미지는
+   * 페이지 맨 끝에 따로. 실측: 볼트 175개 파일에서 마커 978건이 Notion 에 그대로
+   * 텍스트로 새고 있었고 그중 964건(98.6%)이 이 미디어 쌍이었다. 사용자가 Notion 에서
+   * 보는 화면이 깨질 뿐 아니라 이미지가 본문 흐름에서 이탈한다.
+   *
+   * 캡션에는 원본 임베드 대상을 그대로 적는다. pull 이 경로(와 `|별칭`)를 되찾는
+   * 진실원이 되고, 사용자에게도 출처가 보인다.
+   *
+   * 볼트에서 파일을 못 찾으면 자리표시자를 그대로 둔다 — 마커가 남아야 pull 이
+   * 임베드를 복원할 수 있으므로, 반쯤 지우는 것보다 안전하다.
+   */
+  async materializeLocalMedia(pageId, pushedMarkdown, notePath) {
+    const empty = { uploaded: [], handledTargets: /* @__PURE__ */ new Set() };
+    if (!this.notionClient) return empty;
+    LOCAL_MARKER_RE.lastIndex = 0;
+    if (!LOCAL_MARKER_RE.test(pushedMarkdown)) return empty;
+    let hits;
+    try {
+      hits = await this.collectPlaceholders(pageId);
+    } catch (error) {
+      getLogger().warn(`\uBBF8\uB514\uC5B4 \uC790\uB9AC\uD45C\uC2DC\uC790 \uC870\uD68C \uC2E4\uD328 (${pageId}):`, error);
+      return empty;
+    }
+    if (hits.length === 0) return empty;
+    const noteFolder = folderOf(notePath);
+    const uploaded = [];
+    const handledTargets = /* @__PURE__ */ new Set();
+    for (const hit of hits) {
+      const vaultTarget = stripAlias2(hit.target);
+      try {
+        const result = await this.uploadLocalImage(vaultTarget, noteFolder);
+        const fileName = baseName(vaultTarget);
+        const caption = [{ type: "text", text: { content: hit.target } }];
+        const block = hit.kind === "image" ? {
+          type: "image",
+          image: { type: "file_upload", file_upload: { id: result.fileUploadId }, caption }
+        } : {
+          type: "file",
+          file: {
+            type: "file_upload",
+            file_upload: { id: result.fileUploadId },
+            name: fileName,
+            caption
           }
+        };
+        await this.notionClient.appendChildren(hit.parentId, [block], { after: hit.blockId });
+        await this.notionClient.deleteBlock(hit.blockId);
+        uploaded.push(result);
+        handledTargets.add(hit.target);
+        handledTargets.add(vaultTarget);
+        handledTargets.add(result.localPath);
+      } catch (error) {
+        if (error?.code === "ENOENT") {
+          getLogger().warn(`\uBBF8\uB514\uC5B4 \uC81C\uC790\uB9AC \uC0BD\uC785 \uAC74\uB108\uB700 \u2014 \uBCFC\uD2B8\uC5D0\uC11C \uD30C\uC77C\uC744 \uCC3E\uC9C0 \uBABB\uD568: ${vaultTarget}`);
+        } else {
+          getLogger().warn(`\uBBF8\uB514\uC5B4 \uC81C\uC790\uB9AC \uC0BD\uC785 \uC2E4\uD328 (${vaultTarget}):`, error);
         }
       }
     }
-    return results;
+    this.registerUploads(pageId, uploaded);
+    return { uploaded, handledTargets };
   }
   /**
-   * 임베드 경로를 볼트 실제 파일로 해석한다(F23). Obsidian 위키링크 임베드는 노트 옆
-   * 파일을 파일명만으로 참조하는 게 관례라, 노트 폴더 → 볼트 루트 → attachments/ 순으로
-   * 시도한다. 폴백은 조용히 진행하고, 전부 실패했을 때만 마지막 오류를 던진다.
+   * 페이지 블록 트리를 훑어 자리표시자를 부모와 함께 모은다. 콜아웃·토글·목록 안에
+   * 들어간 임베드도 제자리 교체하려면 부모 id 가 필요하다(append 의 after_block 은
+   * 같은 부모의 자식만 기준으로 삼는다).
    */
-  async readImageFromVault(localPath, noteFolder) {
+  async collectPlaceholders(rootId, depth = 0) {
+    if (depth > 4) return [];
+    const client = this.notionClient;
+    const children = await client.fetchAllChildren(rootId);
+    const hits = [];
+    for (const block of children) {
+      const marker = PLACEHOLDER_MARKER_RE.exec(plainTextOf(block));
+      if (marker) {
+        hits.push({
+          parentId: rootId,
+          blockId: block.id,
+          kind: marker[1] === "image" ? "image" : "file",
+          // 마커에 실린 경로는 퍼센트 인코딩돼 있다 — 볼트 조회·캡션 모두 원문이어야 한다.
+          target: decodeMarkerTarget(marker[2])
+        });
+        continue;
+      }
+      if (block.has_children && !NON_DESCENDABLE_TYPES.has(block.type)) {
+        hits.push(...await this.collectPlaceholders(block.id, depth + 1));
+      }
+    }
+    return hits;
+  }
+  /**
+   * 업로드분을 file_registry 에 남긴다. 노트 임베드는 여기서 페이지에 붙으므로,
+   * 이후 FileHandler.pushAllFiles 가 같은 첨부를 폴더 페이지에 standalone 으로
+   * 재업로드하는 중복을 공유 레지스트리로 차단한다.
+   */
+  registerUploads(pageId, results) {
+    if (!this.stateDb || results.length === 0) return;
+    for (const r of results) {
+      try {
+        this.stateDb.registerFile({
+          localPath: r.localPath,
+          notionPageId: pageId,
+          fileUploadId: r.fileUploadId,
+          fileType: "image",
+          fileHash: r.fileHash,
+          fileSize: r.fileSize
+        });
+      } catch (error) {
+        getLogger().warn(`\uBBF8\uB514\uC5B4 \uB808\uC9C0\uC2A4\uD2B8\uB9AC \uB4F1\uB85D \uC2E4\uD328 (${r.localPath}):`, error);
+      }
+    }
+  }
+  /**
+   * 임베드 경로가 가리킬 수 있는 볼트 실제 파일 후보를 우선순위대로 만든다(F23).
+   * Obsidian 위키링크 임베드는 노트 옆 파일을 파일명만으로 참조하는 게 관례라
+   * 노트 폴더 → 볼트 루트 → attachments/ 순.
+   *
+   * push(업로드)와 pull(원본 복원)이 **같은 사다리**를 봐야 왕복이 닫힌다. 예전에는
+   * pull 쪽이 볼트 루트만 확인해서, `__e2e_probe__/노트.md` 안의 `![[t-img.png]]` 는
+   * 올라갈 때는 노트 폴더에서 잘 찾아 올리고도 내려올 때는 원본을 못 찾아 사본을
+   * 새로 받았다(실측) — 왕복할 때마다 첨부가 한 벌씩 늘어난다.
+   */
+  vaultCandidates(localPath, noteFolder) {
     const candidates = [];
     if (noteFolder && !localPath.includes("/")) {
       candidates.push(`${noteFolder}/${localPath}`);
     }
     candidates.push(localPath, `${this.attachmentFolder}/${localPath}`);
+    return candidates;
+  }
+  /**
+   * 임베드 경로를 볼트 실제 파일로 해석해 읽는다(F23).
+   * 폴백은 조용히 진행하고, 전부 실패했을 때만 마지막 오류를 던진다.
+   */
+  async readImageFromVault(localPath, noteFolder) {
+    const candidates = this.vaultCandidates(localPath, noteFolder);
     let lastError;
     for (const candidate of candidates) {
       try {
@@ -4675,11 +5401,8 @@ var ImageHandler = class {
     }
     throw lastError;
   }
-  getContentTypeFromPath(filename) {
-    const ext = filename.match(/\.[^.]+$/)?.[0]?.toLowerCase();
-    return (ext && EXTENSION_TO_MIME[ext]) ?? "application/octet-stream";
-  }
-  async downloadAllFiles(markdown, pageTitle) {
+  async downloadAllFiles(markdown, pageTitle, notePath) {
+    const noteFolder = folderOf(notePath);
     const fileLinks = scanMarkdownLinks(markdown).filter(
       (s) => !s.isEmbed && FILE_LABEL_PREFIX_RE.test(s.label)
     );
@@ -4702,6 +5425,15 @@ var ImageHandler = class {
     for (const span of notionHttpMatches) {
       await sema.acquire();
       try {
+        const original = await this.resolveOriginalTarget(
+          span.label,
+          uploadedFileNameFromUrl(span.url),
+          noteFolder
+        );
+        if (original) {
+          result = result.replace(span.full, `![[${original}]]`);
+          continue;
+        }
         const caption = toWikilinkAlias(span.label.replace(FILE_LABEL_PREFIX_RE, "")) || "file";
         const download = await this.downloadFile(span.url, pageTitle, caption);
         if (!download.localPath) continue;
@@ -4721,6 +5453,11 @@ var ImageHandler = class {
         if (!parsed || !this.notionClient) continue;
         const blockId = parsed.blockId;
         const fileName = parsed.fileName;
+        const original = await this.resolveOriginalTarget(span.label, fileName, noteFolder);
+        if (original) {
+          result = result.replace(span.full, `![[${original}]]`);
+          continue;
+        }
         const realUrl = await this.notionClient.getFileBlockUrl(blockId);
         if (!realUrl) continue;
         const caption = fileName || toWikilinkAlias(span.label.replace(FILE_LABEL_PREFIX_RE, "")) || "file";
@@ -4739,6 +5476,15 @@ var ImageHandler = class {
       await sema.acquire();
       try {
         const url = match[1];
+        const original = await this.resolveOriginalTarget(
+          match[2] ?? "",
+          uploadedFileNameFromUrl(url),
+          noteFolder
+        );
+        if (original) {
+          result = result.replace(match[0], `![[${original}]]`);
+          continue;
+        }
         const caption = toWikilinkAlias(match[2] ?? "") || "file";
         const download = await this.downloadFile(url, pageTitle, caption);
         if (!download.localPath) continue;
@@ -4759,6 +5505,11 @@ var ImageHandler = class {
         if (!parsed || !this.notionClient) continue;
         const blockId = parsed.blockId;
         const fileName = parsed.fileName;
+        const original = await this.resolveOriginalTarget(match[2] ?? "", fileName, noteFolder);
+        if (original) {
+          result = result.replace(match[0], `![[${original}]]`);
+          continue;
+        }
         const realUrl = await this.notionClient.getFileBlockUrl(blockId);
         if (!realUrl) continue;
         const caption = fileName || toWikilinkAlias(match[2] ?? "") || "file";
@@ -4799,7 +5550,7 @@ var ImageHandler = class {
             `[Im-Nobsidian] \uD30C\uC77C \uB2E4\uC6B4\uB85C\uB4DC \uC7AC\uC2DC\uB3C4 (${attempt + 1}/${maxRetries}): ${caption}`
           );
         }
-        const response = await this.fetchFn(url);
+        const response = await this.fetchForDownload(url);
         if (!response.ok) {
           throw new Error(`\uD30C\uC77C \uB2E4\uC6B4\uB85C\uB4DC \uC2E4\uD328: ${response.status} ${response.statusText}`);
         }
@@ -4898,139 +5649,105 @@ function selectStaleDbArtifacts(files, localFolder, keepPaths) {
   return stale;
 }
 
-// src/sync/file-handler.ts
-var EXTENSION_TO_BLOCK_TYPE = {
-  ".png": "image",
-  ".jpg": "image",
-  ".jpeg": "image",
-  ".gif": "image",
-  ".svg": "image",
-  ".webp": "image",
-  ".ico": "image",
-  ".bmp": "image",
-  ".tiff": "image",
-  ".tif": "image",
-  ".avif": "image",
-  ".apng": "image",
-  ".heic": "image",
-  ".pdf": "pdf",
-  ".mp4": "video",
-  ".mov": "video",
-  ".webm": "video",
-  ".avi": "video",
-  ".mkv": "video",
-  ".flv": "video",
-  ".wmv": "video",
-  ".m4v": "video",
-  ".mpeg": "video",
-  ".ogv": "video",
-  ".3gp": "video",
-  ".mp3": "audio",
-  ".wav": "audio",
-  ".ogg": "audio",
-  ".m4a": "audio",
-  ".flac": "audio",
-  ".aac": "audio",
-  ".wma": "audio",
-  ".opus": "audio",
-  ".weba": "audio"
-};
-var EXTENSION_TO_MIME2 = {
-  ".png": "image/png",
-  ".jpg": "image/jpeg",
-  ".jpeg": "image/jpeg",
-  ".gif": "image/gif",
-  ".webp": "image/webp",
-  ".svg": "image/svg+xml",
-  ".bmp": "image/bmp",
-  ".ico": "image/x-icon",
-  ".tiff": "image/tiff",
-  ".tif": "image/tiff",
-  ".avif": "image/avif",
-  ".heic": "image/heic",
-  ".pdf": "application/pdf",
-  ".mp4": "video/mp4",
-  ".mov": "video/quicktime",
-  ".webm": "video/webm",
-  ".avi": "video/x-msvideo",
-  ".mkv": "video/x-matroska",
-  ".mp3": "audio/mpeg",
-  ".wav": "audio/wav",
-  ".ogg": "audio/ogg",
-  ".m4a": "audio/mp4",
-  ".flac": "audio/flac",
-  ".aac": "audio/aac",
-  ".docx": "application/vnd.openxmlformats-officedocument.wordprocessingml.document",
-  ".xlsx": "application/vnd.openxmlformats-officedocument.spreadsheetml.sheet",
-  ".pptx": "application/vnd.openxmlformats-officedocument.presentationml.presentation",
-  ".zip": "application/zip",
-  ".gz": "application/gzip",
-  ".tar": "application/x-tar",
-  ".rar": "application/vnd.rar",
-  ".7z": "application/x-7z-compressed",
-  ".py": "text/x-python",
-  ".js": "text/javascript",
-  ".ts": "text/typescript",
-  ".json": "application/json",
-  ".csv": "text/csv",
-  ".txt": "text/plain",
-  ".html": "text/html",
-  ".xml": "application/xml",
-  ".hwp": "application/x-hwp",
-  ".xls": "application/vnd.ms-excel",
-  ".doc": "application/msword",
-  ".ppt": "application/vnd.ms-powerpoint"
+// src/utils/deadline.ts
+var DEFAULT_ITEM_TIMEOUT_MS = 18e5;
+var DeadlineExceededError = class extends Error {
+  constructor(label, timeoutMs) {
+    super(`\uC2DC\uAC04 \uC0C1\uD55C \uCD08\uACFC(${Math.round(timeoutMs / 1e3)}\uCD08): ${label}`);
+    this.label = label;
+    this.timeoutMs = timeoutMs;
+    this.name = "DeadlineExceededError";
+  }
+  label;
+  timeoutMs;
 };
-function getBlockType(filename) {
-  const ext = filename.match(/\.[^.]+$/)?.[0]?.toLowerCase();
-  if (!ext) return "file";
-  return EXTENSION_TO_BLOCK_TYPE[ext] ?? "file";
-}
-function getMimeType(filename) {
-  const ext = filename.match(/\.[^.]+$/)?.[0]?.toLowerCase();
-  if (!ext) return "application/octet-stream";
-  return EXTENSION_TO_MIME2[ext] ?? "application/octet-stream";
+async function withDeadline(task, timeoutMs, label) {
+  if (!Number.isFinite(timeoutMs) || timeoutMs <= 0) return task();
+  let timer;
+  try {
+    return await Promise.race([
+      task(),
+      new Promise((_resolve, reject) => {
+        timer = setTimeout(() => reject(new DeadlineExceededError(label, timeoutMs)), timeoutMs);
+      })
+    ]);
+  } finally {
+    if (timer !== void 0) clearTimeout(timer);
+  }
 }
+
+// src/sync/file-handler.ts
 function getFolderPath(filePath) {
   const parts = filePath.split("/");
   return parts.length > 1 ? parts.slice(0, -1).join("/") : "";
 }
 var FileHandler = class {
-  constructor(vaultFs, notionClient, stateDb, concurrency = 2) {
+  constructor(vaultFs, notionClient, stateDb, concurrency = 2, options) {
     this.vaultFs = vaultFs;
     this.notionClient = notionClient;
     this.stateDb = stateDb;
     this.sema = new Sema(concurrency);
+    this.customFetch = options?.fetch;
+    this.downloadTimeoutMs = options?.downloadTimeoutMs ?? DEFAULT_DOWNLOAD_TIMEOUT_MS;
+    this.itemTimeoutMs = options?.itemTimeoutMs ?? DEFAULT_ITEM_TIMEOUT_MS;
   }
   vaultFs;
   notionClient;
   stateDb;
   sema;
+  customFetch;
+  downloadTimeoutMs;
+  itemTimeoutMs;
+  get fetchFn() {
+    return this.customFetch ?? globalThis.fetch;
+  }
   async pushFilesForFolder(folderPageId, folderPath) {
     const allFiles = await this.listUploadableFiles();
     const folderFiles = allFiles.filter((f) => getFolderPath(f.path) === folderPath);
     if (folderFiles.length === 0) return [];
     const results = [];
     for (const file of folderFiles) {
-      const existing = this.stateDb.getFileRegistry(file.path);
-      if (existing) {
-        if (existing.fileSize === file.size) continue;
-        const buffer = await this.vaultFs.readBinary(file.path);
-        const currentHash = createHash("sha256").update(buffer).digest("hex");
-        if (existing.fileHash === currentHash) continue;
-      }
-      await this.sema.acquire();
-      try {
-        const result = await this.uploadFile(file, folderPageId);
-        if (result) results.push(result);
-      } catch (error) {
-        getLogger().warn(`\uD30C\uC77C \uC5C5\uB85C\uB4DC \uC2E4\uD328 (${file.path}):`, error);
-      } finally {
-        this.sema.release();
-      }
+      const result = await this.pushSingleFile(file, folderPageId);
+      if (result) results.push(result);
     }
     return results;
   }
+  /**
+   * 첨부 1건을 폴더 페이지에 올린다 — 두 push 경로(`pushFilesForFolder` · `pushAllFiles`)의
+   * 공통 단위. 변경 없음 판정·동시성 슬롯·시간 상한·실패 격리를 모두 여기 한 곳에 둔다.
+   *
+   * 한 곳에 모은 이유는 R9a 에서 실제로 데인 적이 있어서다. 같은 다운로드 로직이
+   * image/file 핸들러에 두 벌 존재한 탓에 한쪽에만 상한이 걸린 채로 남았고, 상한 없는
+   * 쪽이 세마포어를 쥔 채 영원히 매달렸다. 여기도 같은 코드가 두 루프에 나뉘어 있었다.
+   *
+   * 상한(R9f): 업로드는 호출 1건마다 상한이 있어도(SDK 30초) 멀티파트는 파트 수만큼
+   * 호출이 늘어나는 **합성 경로**라 전체로는 여전히 무한대다. 상한을 넘긴 첨부는 경고만
+   * 남기고 나머지 첨부는 계속 올린다 — 첨부 하나가 push 전체를 멎게 하지 않는다.
+   *
+   * @returns 업로드 결과. 변경 없음(스킵)이거나 실패했으면 null.
+   */
+  async pushSingleFile(file, folderPageId) {
+    const existing = this.stateDb.getFileRegistry(file.path);
+    if (existing) {
+      if (existing.fileSize === file.size) return null;
+      const buffer = await this.vaultFs.readBinary(file.path);
+      const currentHash = createHash("sha256").update(buffer).digest("hex");
+      if (existing.fileHash === currentHash) return null;
+    }
+    await this.sema.acquire();
+    try {
+      return await withDeadline(
+        () => this.uploadFile(file, folderPageId),
+        this.itemTimeoutMs,
+        `\uCCA8\uBD80 \uC5C5\uB85C\uB4DC ${file.path}`
+      );
+    } catch (error) {
+      getLogger().warn(`\uD30C\uC77C \uC5C5\uB85C\uB4DC \uC2E4\uD328 (${file.path}):`, error);
+      return null;
+    } finally {
+      this.sema.release();
+    }
+  }
   /**
    * 업로드 후보 목록 — 도구 내부 산출물(`.base`/`.notion.json`)은 제외한다.
    * node 측 VaultFS 는 과거 `.base` 를 워커에서 빼는 식으로 우회했지만, Obsidian
@@ -5064,28 +5781,14 @@ var FileHandler = class {
         continue;
       }
       for (const file of files) {
-        const existing = this.stateDb.getFileRegistry(file.path);
-        if (existing) {
-          if (existing.fileSize === file.size) continue;
-          const buffer = await this.vaultFs.readBinary(file.path);
-          const currentHash = createHash("sha256").update(buffer).digest("hex");
-          if (existing.fileHash === currentHash) continue;
-        }
-        await this.sema.acquire();
-        try {
-          const result = await this.uploadFile(file, folderPageId);
-          if (result) results.push(result);
-        } catch (error) {
-          getLogger().warn(`\uD30C\uC77C \uC5C5\uB85C\uB4DC \uC2E4\uD328 (${file.path}):`, error);
-        } finally {
-          this.sema.release();
-        }
+        const result = await this.pushSingleFile(file, folderPageId);
+        if (result) results.push(result);
       }
     }
     return results;
   }
   async downloadFileBlock(url, filename, targetFolder) {
-    const response = await fetch(url);
+    const response = await fetchForDownload(this.fetchFn, url, this.downloadTimeoutMs);
     if (!response.ok) {
       throw new Error(`\uD30C\uC77C \uB2E4\uC6B4\uB85C\uB4DC \uC2E4\uD328: ${response.status} ${response.statusText}`);
     }
@@ -5174,6 +5877,9 @@ var FileHandler = class {
 function resolvePullConflict(input) {
   const { record, localContent, remoteContent, remoteChange, strategy } = input;
   const localHash = computeHash(localContent);
+  if (input.localExists === false) {
+    return { action: "write", localHash };
+  }
   const localModified = localHash !== record.contentHash;
   if (!localModified) {
     return { action: "write", localHash };
@@ -5255,20 +5961,19 @@ function selectDbRowFiles(files, localFolder) {
     return rel.length > 0 && !rel.includes("/");
   });
 }
+function pagePathCandidates(dir, safeName, pageId) {
+  const base = dir ? `${dir}/${safeName}` : safeName;
+  const raw = pageId.replace(/-/g, "");
+  return [`${base}.md`, ...[8, 16, 32].map((len) => `${base} (${raw.slice(0, len)}).md`)];
+}
 function resolveDbRowPath(localFolder, safeName, pageId, lookupByPath) {
   const ownedBySelf = (candidate) => {
     const owner = lookupByPath(candidate);
     if (!owner) return true;
     return owner.notionPageId != null && notionIdsEqual(owner.notionPageId, pageId);
   };
-  const natural = `${localFolder}/${safeName}.md`;
-  if (ownedBySelf(natural)) return natural;
-  const raw = pageId.replace(/-/g, "");
-  for (const len of [8, 16, 32]) {
-    const candidate = `${localFolder}/${safeName} (${raw.slice(0, len)}).md`;
-    if (ownedBySelf(candidate)) return candidate;
-  }
-  return `${localFolder}/${safeName} (${raw}).md`;
+  const candidates = pagePathCandidates(localFolder, safeName, pageId);
+  return candidates.find(ownedBySelf) ?? candidates[candidates.length - 1];
 }
 
 // src/utils/db-folder-path.ts
@@ -5285,50 +5990,356 @@ function resolveDbFolderPath(folder, dbId, ownerOf) {
   }
   return `${folder} (${raw})`;
 }
-function repairDbFolderCollisions(configs, takenFolders) {
-  const owner = new Map(takenFolders ?? []);
-  let repaired = 0;
-  for (const config of configs) {
-    const resolved = resolveDbFolderPath(
-      config.localFolder,
-      config.databaseId,
-      (f) => owner.get(f) ?? null
-    );
-    if (resolved !== config.localFolder) {
-      config.localFolder = resolved;
-      repaired++;
+function repairDbFolderCollisions(configs, takenFolders) {
+  const owner = new Map(takenFolders ?? []);
+  let repaired = 0;
+  for (const config of configs) {
+    const resolved = resolveDbFolderPath(
+      config.localFolder,
+      config.databaseId,
+      (f) => owner.get(f) ?? null
+    );
+    if (resolved !== config.localFolder) {
+      config.localFolder = resolved;
+      repaired++;
+    }
+    owner.set(resolved, config.databaseId);
+  }
+  return repaired;
+}
+function isDirectDbRowPath(localFolder, path) {
+  const prefix = localFolder.endsWith("/") ? localFolder : `${localFolder}/`;
+  if (!path.startsWith(prefix)) return false;
+  const rel = path.slice(prefix.length);
+  return rel.length > 0 && !rel.includes("/");
+}
+
+// src/view/notion-filter-translator.ts
+function translateNotionFilter(filter, schema, resolveName) {
+  const ctx = { resolveName, schema, untranslated: /* @__PURE__ */ new Set() };
+  const node = translateNode(filter, ctx);
+  return {
+    node,
+    untranslated: [...ctx.untranslated].sort((a, b) => a.localeCompare(b))
+  };
+}
+function translateNode(node, ctx) {
+  if (!isRecord(node)) return null;
+  if (Array.isArray(node["and"])) {
+    const parts = node["and"].map((c) => translateNode(c, ctx)).filter(isNode);
+    if (parts.length === 0) return null;
+    return parts.length === 1 ? parts[0] : { and: parts };
+  }
+  if (Array.isArray(node["or"])) {
+    const children = node["or"];
+    const parts = [];
+    for (const child of children) {
+      const part = translateNode(child, ctx);
+      if (part === null) {
+        ctx.untranslated.add("or \uADF8\uB8F9 \uC548\uC5D0 \uC62E\uAE38 \uC218 \uC5C6\uB294 \uC870\uAC74\uC774 \uC788\uC5B4 \uADF8\uB8F9 \uC804\uCCB4\uB97C \uC0DD\uB7B5\uD568");
+        return null;
+      }
+      parts.push(part);
+    }
+    if (parts.length === 0) return null;
+    return parts.length === 1 ? parts[0] : { or: parts };
+  }
+  if (Array.isArray(node["not"])) {
+    const parts = [];
+    for (const child of node["not"]) {
+      const part = translateNode(child, ctx);
+      if (part === null) {
+        ctx.untranslated.add("not \uADF8\uB8F9 \uC548\uC5D0 \uC62E\uAE38 \uC218 \uC5C6\uB294 \uC870\uAC74\uC774 \uC788\uC5B4 \uADF8\uB8F9 \uC804\uCCB4\uB97C \uC0DD\uB7B5\uD568");
+        return null;
+      }
+      parts.push(part);
+    }
+    return parts.length === 0 ? null : { not: parts };
+  }
+  return translateLeaf(node, ctx);
+}
+function translateLeaf(leaf, ctx) {
+  const timestamp = leaf["timestamp"];
+  if (typeof timestamp === "string") {
+    const ref2 = timestamp === "created_time" ? "file.ctime" : "file.mtime";
+    const cond = leaf[timestamp];
+    if (!isRecord(cond)) return unsupported(ctx, `timestamp '${timestamp}' \uD544\uD130`);
+    return translateDate(ref2, cond, ctx, `timestamp '${timestamp}'`);
+  }
+  const propRaw = leaf["property"];
+  if (typeof propRaw !== "string") return null;
+  const propName = ctx.resolveName(propRaw);
+  if (!propName) {
+    return unsupported(ctx, `\uC18D\uC131 '${propRaw}' \uC744 \uC2A4\uD0A4\uB9C8\uC5D0\uC11C \uCC3E\uC9C0 \uBABB\uD574 \uC870\uAC74\uC744 \uC0DD\uB7B5\uD568`);
+  }
+  const ref = noteRef(propName);
+  const label = `\uC18D\uC131 '${propName}'`;
+  for (const [typeKey, condRaw] of Object.entries(leaf)) {
+    if (typeKey === "property") continue;
+    if (!isRecord(condRaw)) continue;
+    switch (typeKey) {
+      case "title":
+      case "rich_text":
+      case "url":
+      case "email":
+      case "phone_number":
+        return translateText(ref, condRaw, ctx, label);
+      case "number":
+        return translateNumber(ref, condRaw, ctx, label);
+      case "checkbox":
+        return translateCheckbox(ref, condRaw, ctx, label);
+      case "select":
+        return translateSelect(ref, condRaw, ctx, label);
+      case "status":
+        return translateStatus(ref, condRaw, ctx, label, propName);
+      case "multi_select":
+      case "relation":
+      case "people":
+        return translateList(ref, condRaw, ctx, label);
+      case "files":
+        return translateEmptiness(ref, condRaw, ctx, label);
+      case "date":
+      case "created_time":
+      case "last_edited_time":
+        return translateDate(ref, condRaw, ctx, label);
+      case "formula":
+      case "rollup":
+        return unsupported(ctx, `${label}: ${typeKey} \uD544\uD130\uB294 Bases \uB85C \uC62E\uAE38 \uC218 \uC5C6\uC74C`);
+      default:
+        return unsupported(ctx, `${label}: '${typeKey}' \uD544\uD130 \uC720\uD615 \uBBF8\uC9C0\uC6D0`);
+    }
+  }
+  return null;
+}
+function translateText(ref, cond, ctx, label) {
+  const empt = translateEmptinessOnly(ref, cond);
+  if (empt) return empt;
+  const [op, value] = firstEntry(cond);
+  if (typeof value !== "string") return unsupported(ctx, `${label}: '${op}' \uAC12\uC774 \uBB38\uC790\uC5F4\uC774 \uC544\uB2D8`);
+  const lit = str(value);
+  switch (op) {
+    case "equals":
+      return `${ref} == ${lit}`;
+    case "does_not_equal":
+      return `${ref} != ${lit}`;
+    case "contains":
+      return `${ref}.contains(${lit})`;
+    case "does_not_contain":
+      return `!${ref}.contains(${lit})`;
+    case "starts_with":
+      return `${ref}.startsWith(${lit})`;
+    case "ends_with":
+      return `${ref}.endsWith(${lit})`;
+    default:
+      return unsupported(ctx, `${label}: \uD14D\uC2A4\uD2B8 \uC5F0\uC0B0\uC790 '${op}' \uBBF8\uC9C0\uC6D0`);
+  }
+}
+function translateNumber(ref, cond, ctx, label) {
+  const empt = translateEmptinessOnly(ref, cond);
+  if (empt) return empt;
+  const [op, value] = firstEntry(cond);
+  if (typeof value !== "number") return unsupported(ctx, `${label}: '${op}' \uAC12\uC774 \uC22B\uC790\uAC00 \uC544\uB2D8`);
+  switch (op) {
+    case "equals":
+      return `${ref} == ${value}`;
+    case "does_not_equal":
+      return `${ref} != ${value}`;
+    case "greater_than":
+      return `${ref} > ${value}`;
+    case "less_than":
+      return `${ref} < ${value}`;
+    case "greater_than_or_equal_to":
+      return `${ref} >= ${value}`;
+    case "less_than_or_equal_to":
+      return `${ref} <= ${value}`;
+    default:
+      return unsupported(ctx, `${label}: \uC22B\uC790 \uC5F0\uC0B0\uC790 '${op}' \uBBF8\uC9C0\uC6D0`);
+  }
+}
+function translateCheckbox(ref, cond, ctx, label) {
+  const [op, value] = firstEntry(cond);
+  if (typeof value !== "boolean") return unsupported(ctx, `${label}: '${op}' \uAC12\uC774 \uBD88\uB9AC\uC5B8\uC774 \uC544\uB2D8`);
+  if (op === "equals") return `${ref} == ${value}`;
+  if (op === "does_not_equal") return `${ref} != ${value}`;
+  return unsupported(ctx, `${label}: \uCCB4\uD06C\uBC15\uC2A4 \uC5F0\uC0B0\uC790 '${op}' \uBBF8\uC9C0\uC6D0`);
+}
+function translateSelect(ref, cond, ctx, label) {
+  const empt = translateEmptinessOnly(ref, cond);
+  if (empt) return empt;
+  const [op, value] = firstEntry(cond);
+  const names = toStringList(value);
+  if (names === null) return unsupported(ctx, `${label}: '${op}' \uAC12 \uD615\uD0DC\uB97C \uD574\uC11D\uD558\uC9C0 \uBABB\uD568`);
+  return equalityOverNames(ref, op, names, ctx, label);
+}
+function translateStatus(ref, cond, ctx, label, propName) {
+  const empt = translateEmptinessOnly(ref, cond);
+  if (empt) return empt;
+  const [op, value] = firstEntry(cond);
+  const raw = toStringList(value);
+  if (raw === null) return unsupported(ctx, `${label}: '${op}' \uAC12 \uD615\uD0DC\uB97C \uD574\uC11D\uD558\uC9C0 \uBABB\uD568`);
+  const prop = ctx.schema[propName];
+  const optionNames = new Set((prop?.options ?? []).map((o) => o.name));
+  const expanded = [];
+  for (const name of raw) {
+    if (optionNames.has(name)) {
+      expanded.push(name);
+      continue;
     }
-    owner.set(resolved, config.databaseId);
+    const group = prop?.groups?.find((g) => g.name === name);
+    const members = group && prop ? expandGroup(group, prop) : null;
+    if (members === null) {
+      return unsupported(ctx, `${label}: \uC0C1\uD0DC '${name}' \uC744 \uC635\uC158\uC73C\uB85C \uC804\uAC1C\uD558\uC9C0 \uBABB\uD568`);
+    }
+    expanded.push(...members);
   }
-  return repaired;
+  if (expanded.length === 0) {
+    return unsupported(ctx, `${label}: \uC0C1\uD0DC \uADF8\uB8F9\uC5D0 \uC18D\uD55C \uC635\uC158\uC774 \uC5C6\uC5B4 \uC870\uAC74\uC744 \uC0DD\uB7B5\uD568`);
+  }
+  return equalityOverNames(ref, op, dedupe(expanded), ctx, label);
 }
-function isDirectDbRowPath(localFolder, path) {
-  const prefix = localFolder.endsWith("/") ? localFolder : `${localFolder}/`;
-  if (!path.startsWith(prefix)) return false;
-  const rel = path.slice(prefix.length);
-  return rel.length > 0 && !rel.includes("/");
+function expandGroup(group, prop) {
+  const ids = group.optionIds;
+  if (!ids || ids.length === 0) return [];
+  const byId = new Map((prop.options ?? []).map((o) => [o.id, o.name]));
+  const names = [];
+  for (const id of ids) {
+    const name = id === void 0 ? void 0 : byId.get(id);
+    if (name === void 0) return null;
+    names.push(name);
+  }
+  return names;
+}
+function equalityOverNames(ref, op, names, ctx, label) {
+  if (names.length === 0) return unsupported(ctx, `${label}: '${op}' \uBE44\uAD50 \uB300\uC0C1\uC774 \uBE44\uC5B4 \uC788\uC74C`);
+  if (op === "equals") {
+    const parts = names.map((n) => `${ref} == ${str(n)}`);
+    return parts.length === 1 ? parts[0] : { or: parts };
+  }
+  if (op === "does_not_equal") {
+    const parts = names.map((n) => `${ref} != ${str(n)}`);
+    return parts.length === 1 ? parts[0] : { and: parts };
+  }
+  return unsupported(ctx, `${label}: \uC120\uD0DD \uC5F0\uC0B0\uC790 '${op}' \uBBF8\uC9C0\uC6D0`);
+}
+function translateList(ref, cond, ctx, label) {
+  const empt = translateEmptinessOnly(ref, cond);
+  if (empt) return empt;
+  const [op, value] = firstEntry(cond);
+  const names = toStringList(value);
+  if (names === null) return unsupported(ctx, `${label}: '${op}' \uAC12 \uD615\uD0DC\uB97C \uD574\uC11D\uD558\uC9C0 \uBABB\uD568`);
+  const args = names.map(str).join(", ");
+  if (op === "contains") return `${ref}.containsAny(${args})`;
+  if (op === "does_not_contain") return `!${ref}.containsAny(${args})`;
+  return unsupported(ctx, `${label}: \uBAA9\uB85D \uC5F0\uC0B0\uC790 '${op}' \uBBF8\uC9C0\uC6D0`);
+}
+function translateEmptiness(ref, cond, ctx, label) {
+  const empt = translateEmptinessOnly(ref, cond);
+  if (empt) return empt;
+  const [op] = firstEntry(cond);
+  return unsupported(ctx, `${label}: \uC5F0\uC0B0\uC790 '${op}' \uBBF8\uC9C0\uC6D0`);
+}
+function translateDate(ref, cond, ctx, label) {
+  const empt = translateEmptinessOnly(ref, cond);
+  if (empt) return empt;
+  const [op, value] = firstEntry(cond);
+  if (typeof value !== "string") {
+    return unsupported(ctx, `${label}: \uC0C1\uB300 \uB0A0\uC9DC \uC870\uAC74 '${op}' \uC740 \uC62E\uAE30\uC9C0 \uC54A\uC74C`);
+  }
+  const lit = str(value);
+  switch (op) {
+    case "equals":
+      return `${ref} == ${lit}`;
+    case "before":
+      return `${ref} < ${lit}`;
+    case "after":
+      return `${ref} > ${lit}`;
+    case "on_or_before":
+      return `${ref} <= ${lit}`;
+    case "on_or_after":
+      return `${ref} >= ${lit}`;
+    default:
+      return unsupported(ctx, `${label}: \uB0A0\uC9DC \uC5F0\uC0B0\uC790 '${op}' \uBBF8\uC9C0\uC6D0`);
+  }
+}
+function translateEmptinessOnly(ref, cond) {
+  if (cond["is_empty"] === true) return `${ref}.isEmpty()`;
+  if (cond["is_not_empty"] === true) return `!${ref}.isEmpty()`;
+  return null;
+}
+function unsupported(ctx, reason) {
+  ctx.untranslated.add(reason);
+  return null;
+}
+function noteRef(propertyName) {
+  return `note[${str(propertyName)}]`;
+}
+function str(value) {
+  return `"${value.replace(/\\/g, "\\\\").replace(/"/g, '\\"')}"`;
+}
+function toStringList(value) {
+  if (typeof value === "string") return [value];
+  if (Array.isArray(value) && value.every((v) => typeof v === "string")) return value;
+  return null;
+}
+function firstEntry(cond) {
+  const entries = Object.entries(cond);
+  return entries[0] ?? ["", void 0];
+}
+function dedupe(values) {
+  return [...new Set(values)];
+}
+function isRecord(value) {
+  return typeof value === "object" && value !== null && !Array.isArray(value);
+}
+function isNode(value) {
+  return value !== null;
 }
 
-// src/utils/wikilink-title.ts
-function wikilinkTitleFromPath(obsidianPath) {
-  return obsidianPath.replace(/\.md$/i, "").split("/").pop() ?? "";
+// src/view/property-resolver.ts
+function resolvePropertyName(propertyId, schema) {
+  const target = decodePropertyId(propertyId);
+  for (const [name, prop] of Object.entries(schema)) {
+    if (decodePropertyId(prop.id) === target) return name;
+  }
+  return schema[propertyId] ? propertyId : void 0;
+}
+function decodePropertyId(id) {
+  try {
+    return decodeURIComponent(id);
+  } catch {
+    return id;
+  }
 }
 
 // src/view/base-file-generator.ts
 var NOTION_TO_BASES_VIEW = {
-  table: "table",
-  gallery: "cards",
-  list: "list",
-  board: "cards",
-  calendar: null,
-  timeline: null,
-  form: null,
-  chart: null,
-  map: null,
-  dashboard: null
+  table: { type: "table" },
+  gallery: { type: "cards" },
+  list: { type: "list" },
+  board: { type: "cards" },
+  calendar: {
+    type: "table",
+    degradeReason: "\uB2EC\uB825 \uACA9\uC790\uB294 Bases \uBBF8\uC9C0\uC6D0 \u2014 \uB0A0\uC9DC \uC624\uB984\uCC28\uC21C \uD45C\uB85C \uACA9\uD558"
+  },
+  timeline: {
+    type: "table",
+    degradeReason: "\uD0C0\uC784\uB77C\uC778 \uCD95\uC740 Bases \uBBF8\uC9C0\uC6D0 \u2014 \uB0A0\uC9DC \uC624\uB984\uCC28\uC21C \uD45C\uB85C \uACA9\uD558"
+  },
+  form: { type: null },
+  chart: { type: null },
+  map: { type: null },
+  dashboard: { type: null }
 };
+function basesViewMappingOf(notionType) {
+  return NOTION_TO_BASES_VIEW[notionType] ?? { type: null };
+}
 function basesViewTypeOf(notionType) {
-  return NOTION_TO_BASES_VIEW[notionType] ?? null;
+  return basesViewMappingOf(notionType).type;
+}
+function filterGroup(node) {
+  if ("and" in node) return ["and", node.and];
+  if ("or" in node) return ["or", node.or];
+  return ["not", node.not];
 }
 var BaseFileGenerator = class {
   generate(options) {
@@ -5406,8 +6417,49 @@ var BaseFileGenerator = class {
       if (view.image) {
         lines.push(`    image: ${this.propRef(view.image)}`);
       }
+      if (view.filters) {
+        this.writeFilterValue(lines, view.filters, "    ");
+      }
+    }
+  }
+  /** `filters:` 키와 그 값을 쓴다. 단일 식이면 한 줄, 그룹이면 블록. */
+  writeFilterValue(lines, node, indent) {
+    if (typeof node === "string") {
+      lines.push(`${indent}filters: ${this.yamlExpr(node)}`);
+      return;
+    }
+    lines.push(`${indent}filters:`);
+    const [op, children] = filterGroup(node);
+    lines.push(`${indent}  ${op}:`);
+    for (const child of children) {
+      this.writeFilterItem(lines, child, `${indent}    `);
+    }
+  }
+  /** 필터 노드를 시퀀스 항목(`- …`)으로 쓴다. 그룹이면 재귀적으로 중첩한다. */
+  writeFilterItem(lines, node, indent) {
+    if (typeof node === "string") {
+      lines.push(`${indent}- ${this.yamlExpr(node)}`);
+      return;
+    }
+    const [op, children] = filterGroup(node);
+    lines.push(`${indent}- ${op}:`);
+    for (const child of children) {
+      this.writeFilterItem(lines, child, `${indent}    `);
     }
   }
+  /**
+   * 필터 식을 YAML 스칼라로 쓴다.
+   *
+   * 식은 대개 `note["상태"] == "진행 중"` 처럼 큰따옴표를 품는다. 평문 스칼라는 큰따옴표를
+   * 안에 담을 수 있으므로(선두만 아니면 된다) 기본은 평문으로 두어 기존 `file.ext == "md"`
+   * 라인과 모양을 맞춘다. 다만 `: `·` #`·선두 지시문자는 평문에서 의미가 달라지므로
+   * 그때만 작은따옴표로 감싼다(속성명에 콜론이나 해시가 들어갈 수 있다).
+   */
+  yamlExpr(expr) {
+    const unsafe = expr !== expr.trim() || expr.includes(": ") || expr.includes(" #") || expr.endsWith(":") || /^[-?:,[\]{}#&*!|>'"%@`]/.test(expr);
+    if (!unsafe) return expr;
+    return `'${expr.replace(/'/g, "''")}'`;
+  }
   /**
    * 뷰 이름을 Bases 요구사항대로 유일화한다(in-place). 동명 충돌 시 ' 2',' 3'… 를 붙이되
    * 이미 존재하는 이름과 다시 충돌하지 않을 때까지 증가시킨다.
@@ -5426,7 +6478,7 @@ var BaseFileGenerator = class {
     }
   }
   convertView(view, schema) {
-    const basesType = NOTION_TO_BASES_VIEW[view.type];
+    const basesType = basesViewMappingOf(view.type).type;
     if (!basesType) return null;
     const result = {
       type: basesType,
@@ -5469,6 +6521,12 @@ var BaseFileGenerator = class {
         };
       }
     }
+    if ((view.type === "calendar" || view.type === "timeline") && !result.sort?.length) {
+      const dateName = view.datePropertyName ?? (view.datePropertyId ? this.resolvePropertyName(view.datePropertyId, schema) : void 0);
+      if (dateName) {
+        result.sort = [{ property: this.toNoteRef(dateName), direction: "ASC" }];
+      }
+    }
     if (view.type === "gallery" && view.cover) {
       if (view.cover.type === "property" && view.cover.propertyId) {
         const propName = this.resolvePropertyName(view.cover.propertyId, schema);
@@ -5479,6 +6537,14 @@ var BaseFileGenerator = class {
         result.image = "formula.coverImage";
       }
     }
+    if (view.filter !== void 0 && view.filter !== null) {
+      const { node } = translateNotionFilter(
+        view.filter,
+        schema,
+        (id) => this.resolvePropertyName(id, schema)
+      );
+      if (node) result.filters = node;
+    }
     return result;
   }
   toNoteRef(propertyName) {
@@ -5494,18 +6560,7 @@ var BaseFileGenerator = class {
     return `"${ref.replace(/\\/g, "\\\\").replace(/"/g, '\\"')}"`;
   }
   resolvePropertyName(propertyId, schema) {
-    const target = this.decodeId(propertyId);
-    for (const [name, prop] of Object.entries(schema)) {
-      if (this.decodeId(prop.id) === target) return name;
-    }
-    return void 0;
-  }
-  decodeId(id) {
-    try {
-      return decodeURIComponent(id);
-    } catch {
-      return id;
-    }
+    return resolvePropertyName(propertyId, schema);
   }
   yamlKey(key) {
     if (/^[a-zA-Z_][a-zA-Z0-9_]*$/.test(key)) return key;
@@ -5519,7 +6574,6 @@ var BaseFileGenerator = class {
 
 // src/view/sidecar-generator.ts
 var DROPPED_SETTING_REASONS = {
-  filter: "Notion \uD544\uD130\uC2DD\uC740 .base \uB85C \uD45C\uD604\uB418\uC9C0 \uC54A\uC74C(\uD3F4\uB354 \uD544\uD130\uB9CC \uC801\uC6A9)",
   coverSize: "\uAC24\uB7EC\uB9AC \uCEE4\uBC84 \uD06C\uAE30\uB294 Bases \uBBF8\uC9C0\uC6D0",
   coverAspect: "\uAC24\uB7EC\uB9AC \uCEE4\uBC84 \uBE44\uC728\uC740 Bases \uBBF8\uC9C0\uC6D0",
   viewRange: "\uCE98\uB9B0\uB354 \uD45C\uC2DC \uBC94\uC704(week/month)\uB294 Bases \uBBF8\uC9C0\uC6D0",
@@ -5534,7 +6588,7 @@ var SidecarGenerator = class {
   build(options) {
     const degraded = [];
     const properties = this.buildProperties(options.schema);
-    const views = options.viewsConfig.views.map((v) => this.buildView(v, degraded));
+    const views = options.viewsConfig.views.map((v) => this.buildView(v, options.schema, degraded));
     degraded.sort(
       (a, b) => a.view.localeCompare(b.view) || a.kind.localeCompare(b.kind) || a.detail.localeCompare(b.detail)
     );
@@ -5566,8 +6620,9 @@ var SidecarGenerator = class {
       };
     }).sort((a, b) => a.name.localeCompare(b.name));
   }
-  buildView(view, degraded) {
-    const basesType = basesViewTypeOf(view.type);
+  buildView(view, schema, degraded) {
+    const mapping = basesViewMappingOf(view.type);
+    const basesType = mapping.type;
     const viewName = view.name || view.type;
     if (basesType === null) {
       degraded.push({
@@ -5575,8 +6630,14 @@ var SidecarGenerator = class {
         kind: "view-unrepresentable",
         detail: `'${view.type}' \uBDF0\uB294 Obsidian Bases \uB300\uC751\uC774 \uC5C6\uC5B4 .base \uC5D0\uC11C \uB204\uB77D \u2014 \uC0AC\uC774\uB4DC\uCE74\uB85C\uB9CC \uBCF4\uC874`
       });
+    } else if (mapping.degradeReason) {
+      degraded.push({
+        view: viewName,
+        kind: "view-degraded",
+        detail: `'${view.type}' \uBDF0: ${mapping.degradeReason}`
+      });
     }
-    const config = this.extractConfig(view, basesType, viewName, degraded);
+    const config = this.extractConfig(view, schema, basesType, viewName, degraded);
     return {
       id: view.id,
       name: viewName,
@@ -5590,7 +6651,7 @@ var SidecarGenerator = class {
    * config 에 보존하면서 동시에 degrade 리포트에 1줄씩 기록한다(표현되는 뷰에 한해 —
    * 미표현 뷰는 이미 view-unrepresentable 로 통째 보고됨).
    */
-  extractConfig(view, basesType, viewName, degraded) {
+  extractConfig(view, schema, basesType, viewName, degraded) {
     const config = {};
     const noteDrop = (key) => {
       if (basesType !== null && DROPPED_SETTING_REASONS[key]) {
@@ -5603,7 +6664,7 @@ var SidecarGenerator = class {
     };
     if (view.filter !== void 0 && view.filter !== null) {
       config["filter"] = view.filter;
-      noteDrop("filter");
+      this.noteFilterDegrade(view.filter, schema, basesType, viewName, degraded);
     }
     if (view.sorts && view.sorts.length > 0) config["sorts"] = view.sorts;
     if (view.groupBy) {
@@ -5632,6 +6693,36 @@ var SidecarGenerator = class {
     }
     return config;
   }
+  /**
+   * 필터 손실을 **실제로 못 옮긴 것만** 보고한다.
+   *
+   * 예전엔 필터가 있기만 하면 "Notion 필터식은 .base 로 표현되지 않음"을 무조건 찍었다.
+   * 이제 `.base` 가 뷰별 `filters:` 를 내보내므로 그 문구는 대부분의 경우 거짓이다.
+   * 거짓 degrade 는 진짜 degrade 를 묻어 버리므로, `.base` 와 **같은 번역기**를 돌려
+   * 남은 것만 적는다(두 산출물이 어긋날 여지를 없앤다).
+   */
+  noteFilterDegrade(filter, schema, basesType, viewName, degraded) {
+    if (basesType === null) return;
+    const { node, untranslated } = translateNotionFilter(
+      filter,
+      schema,
+      (id) => resolvePropertyName(id, schema)
+    );
+    for (const reason of untranslated) {
+      degraded.push({
+        view: viewName,
+        kind: "setting-dropped",
+        detail: `\uD544\uD130 \uC77C\uBD80 \uB204\uB77D \u2014 ${reason}`
+      });
+    }
+    if (node === null && untranslated.length === 0) {
+      degraded.push({
+        view: viewName,
+        kind: "setting-dropped",
+        detail: "\uD544\uD130 \uB204\uB77D \u2014 Notion \uD544\uD130\uC2DD\uC744 \uD574\uC11D\uD558\uC9C0 \uBABB\uD574 .base \uC5D0 \uC62E\uAE30\uC9C0 \uBABB\uD568"
+      });
+    }
+  }
 };
 function stableStringify(value) {
   return JSON.stringify(sortKeys(value), null, 2);
@@ -5648,6 +6739,94 @@ function sortKeys(value) {
   return value;
 }
 
+// src/converter/toggle-heading.ts
+var NFM_TOGGLE_HEADING_RE = /^([\t ]*)(#{1,6})[ \t]+(.*?)[ \t]*\{toggle="true"\}[ \t]*$/;
+var MARKED_TOGGLE_HEADING_RE = new RegExp(
+  `^([\\t ]*)(#{1,6})[ \\t]+(.*?)[ \\t]*${TOGGLE_HEADING_START}[ \\t]*$`
+);
+var ANY_HEADING_RE = /^(#{1,6})[ \t]/;
+function headingLine(hashes, title, suffix) {
+  return [hashes, title.trim(), suffix].filter((part) => part !== "").join(" ");
+}
+function convertToggleHeadings(content) {
+  return convertLevel(content.split("\n")).join("\n");
+}
+function convertLevel(lines) {
+  const out = [];
+  const ends = containerBlockEnds(lines);
+  for (let i = 0; i < lines.length; i++) {
+    const match = NFM_TOGGLE_HEADING_RE.exec(lines[i]);
+    if (!match) {
+      out.push(lines[i]);
+      continue;
+    }
+    const [, indent, hashes, title] = match;
+    const childIndent = `${indent}	`;
+    let lastChild = i;
+    for (let j = i + 1; j < lines.length; j++) {
+      const line = lines[j];
+      if (line.trim() === "") continue;
+      if (!line.startsWith(childIndent)) break;
+      lastChild = ends[j];
+      j = lastChild;
+    }
+    if (lastChild === i) {
+      out.push(indent + headingLine(hashes, title, TOGGLE_HEADING_START));
+      continue;
+    }
+    const body = dedentContainerBody(lines.slice(i + 1, lastChild + 1).join("\n"));
+    const inner = convertLevel(body.split("\n")).join("\n");
+    out.push(indent + headingLine(hashes, title, TOGGLE_HEADING_START));
+    out.push(...(indent === "" ? inner : indentContainerBody(inner, indent)).split("\n"));
+    out.push(indent + TOGGLE_HEADING_END);
+    i = lastChild;
+  }
+  return out;
+}
+function restoreToggleHeadings(content) {
+  return restoreLevel(content.split("\n")).join("\n");
+}
+function restoreLevel(lines) {
+  const out = [];
+  for (let i = 0; i < lines.length; i++) {
+    const line = lines[i];
+    const match = MARKED_TOGGLE_HEADING_RE.exec(line);
+    if (!match) {
+      if (line.trim() !== TOGGLE_HEADING_END) out.push(line);
+      continue;
+    }
+    const [, indent, hashes, title] = match;
+    const bound = findBodyEnd(lines, i + 1, hashes.length);
+    const raw = stripContainerIndent(lines.slice(i + 1, bound.bodyEnd).join("\n"), indent);
+    const inner = restoreLevel(raw.split("\n"));
+    const body = inner.join("\n").replace(/^\n+/, "").replace(/\n+$/, "");
+    out.push(indent + headingLine(hashes, title, '{toggle="true"}'));
+    if (body.trim() !== "") out.push(...indentContainerBody(body, `${indent}	`).split("\n"));
+    i = bound.consumed;
+  }
+  return out;
+}
+function findBodyEnd(lines, from, level) {
+  let depth = 0;
+  for (let j = from; j < lines.length; j++) {
+    const line = lines[j];
+    if (MARKED_TOGGLE_HEADING_RE.test(line)) {
+      depth++;
+      continue;
+    }
+    if (line.trim() === TOGGLE_HEADING_END) {
+      if (depth > 0) {
+        depth--;
+        continue;
+      }
+      return { bodyEnd: j, consumed: j };
+    }
+    const heading = ANY_HEADING_RE.exec(line);
+    if (heading && heading[1].length <= level) return { bodyEnd: j, consumed: j - 1 };
+  }
+  return { bodyEnd: lines.length, consumed: lines.length - 1 };
+}
+
 // src/converter/enhanced-md-converter.ts
 var NOTION_CALLOUT_RE = /^::: callout\n([\s\S]*?)\n:::/gm;
 var NOTION_PAGE_MENTION_RE = /<mention-page id="([^"]+)">([\s\S]*?)<\/mention-page>/g;
@@ -5660,10 +6839,14 @@ var NOTION_VIDEO_RE = /[\t ]*<video src="([^"]*)">([\s\S]*?)<\/video>/g;
 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_LABELED_PAGE_LINK_RE = new RegExp(
+  `\\[${MARKER_LABEL_CAPTURE}\\]\\(https?:\\/\\/(?:[a-z]+\\.)?notion\\.(?:so|com)\\/(?:p\\/)?([a-f0-9]{32}|[a-f0-9-]{36})\\)`,
+  "g"
+);
 function notionEnhancedToObsidian(enhanced) {
   let result = enhanced;
+  result = convertToggleHeadings(result);
   result = convertSyncedBlockRef(result);
-  result = normalizeCodeBlockToggles(result);
   result = convertContainers(result);
   result = convertFencedCallouts(result);
   result = convertPageMentions(result);
@@ -5673,6 +6856,7 @@ function notionEnhancedToObsidian(enhanced) {
   result = convertMediaTags(result);
   result = convertTabBlocks(result);
   result = preserveUnknownBlocks(result);
+  result = preserveNfmOnlyBlocks(result);
   result = convertNotionMath(result);
   result = convertNotionTables(result);
   result = convertSpans(result);
@@ -5681,13 +6865,24 @@ function notionEnhancedToObsidian(enhanced) {
   result = removeEmptyBlocks(result);
   result = unescapePipes(result);
   result = unescapeNotionChars(result);
-  result = unescapeWikilinkBrackets(result);
+  result = unescapeBrackets(result);
   result = ensureCalloutContinuity(result);
   result = separateAdjacentCallouts(result);
+  result = clampCalloutIndent(result);
   return result;
 }
-function unescapeWikilinkBrackets(content) {
-  return content.replace(/\\\[\\\[([\s\S]*?)\\\]\\\]/g, "[[$1]]");
+function unescapeBrackets(content) {
+  return mapOutsideCodeFences(
+    content,
+    (segment) => (
+      // 첫 갈래가 escape 된 백슬래시 쌍을 통째로 소비해, 뒤따르는 대괄호가 escape 로
+      // 오인되지 않게 한다. 갈래 순서가 곧 우선순위다.
+      segment.replace(
+        /\\\\|\\\[[^\n[\]]*\\\]\(|\\([[\]])/g,
+        (match, bracket) => bracket === void 0 ? match : bracket
+      )
+    )
+  );
 }
 function obsidianToNotionEnhanced(obsidian) {
   let result = obsidian;
@@ -5696,6 +6891,7 @@ function obsidianToNotionEnhanced(obsidian) {
   result = convertObsidianCallouts(result);
   result = restoreMediaTags(result);
   result = restoreUnknownBlocks(result);
+  result = restoreNfmOnlyBlocks(result);
   result = restoreColorSpans(result);
   result = restoreBlockColorMarkers(result);
   result = restoreUnderlineSpans(result);
@@ -5703,11 +6899,12 @@ function obsidianToNotionEnhanced(obsidian) {
   result = restoreWikilinkPreserveLinks(result);
   result = restoreSyncedBlocks(result);
   result = reassembleColumns(result);
+  result = restoreToggleHeadings(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}([^)]+)\\)`,
+  `\\[${MARKER_LABEL_CAPTURE}\\]\\(${WIKILINK_PROTOCOL}${MARKER_URL_CAPTURE}\\)`,
   "g"
 );
 function convertMentionPageIdToUrl(content) {
@@ -5718,82 +6915,8 @@ function convertMentionPageIdToUrl(content) {
 }
 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 fenceFor(body) {
-  let longest = 0;
-  const re = /`+/g;
-  let m;
-  while ((m = re.exec(body)) !== null) longest = Math.max(longest, m[0].length);
-  return "`".repeat(Math.max(3, longest + 1));
-}
-function dedentContainerBody(text) {
-  const lines = text.split("\n");
-  while (lines.length && lines[0].trim() === "") lines.shift();
-  while (lines.length && lines[lines.length - 1].trim() === "") lines.pop();
-  const kinds = [];
-  let inCode = false;
-  let fenceChar = "";
-  let fenceLen = 0;
-  let inTable = false;
-  for (const line of lines) {
-    const fence = /^[\t ]*(`{3,}|~{3,})(.*)$/.exec(line);
-    if (inCode) {
-      if (fence && fence[1][0] === fenceChar && fence[1].length >= fenceLen && fence[2].trim() === "") {
-        inCode = false;
-        kinds.push("fence");
-      } else {
-        kinds.push("code");
-      }
-    } else if (inTable) {
-      const closes = /<\/table>/.test(line);
-      kinds.push(closes ? "fence" : "code");
-      if (closes) inTable = false;
-    } else if (fence) {
-      inCode = true;
-      fenceChar = fence[1][0];
-      fenceLen = fence[1].length;
-      kinds.push("fence");
-    } else if (/^[\t ]*<table[^>]*>/.test(line)) {
-      if (!/<\/table>/.test(line)) inTable = true;
-      kinds.push("fence");
-    } else {
-      kinds.push("prose");
-    }
-  }
-  let min = Infinity;
-  lines.forEach((l, i) => {
-    if (kinds[i] !== "prose" || l.trim() === "") return;
-    min = Math.min(min, /^[\t ]*/.exec(l)[0].length);
+    return formatWikilink(decodeMarkerTarget(enc), label);
   });
-  if (!Number.isFinite(min)) min = 0;
-  return lines.map((l, i) => {
-    if (l.trim() === "") return "";
-    if (kinds[i] === "code") return l;
-    if (kinds[i] === "fence") return l.replace(/^[\t ]+/, "");
-    return l.slice(min);
-  }).join("\n");
-}
-function normalizeCodeBlockToggles(content) {
-  return content.replace(
-    /^[\t ]*- (.+)\n[\t ]*(`{3,})(\w*)\n([\s\S]*?)\n[\t ]*\2[\t ]*$/gm,
-    (_match, title, _open, lang, rawBody) => {
-      const body = dedentContainerBody(rawBody);
-      const fence = fenceFor(body);
-      return `<details>
-<summary>${title.trim()}</summary>
-${fence}${lang}
-${body}
-${fence}
-</details>`;
-    }
-  );
 }
 var NO_CONTAINER_BODY = "(?:(?!<details|<callout|<columns)[\\s\\S])*?";
 var SUMMARY_TITLE = "((?:(?!<\\/summary>|<details|<summary>)[\\s\\S])*?)";
@@ -5802,14 +6925,17 @@ var INNERMOST_DETAILS_RE = new RegExp(
   "g"
 );
 var INNERMOST_CALLOUT_RE = new RegExp(
-  `([\\t ]*)<callout([^>]*)>\\n?(${NO_CONTAINER_BODY})<\\/callout>`,
+  `([\\t ]*)${nfmOpenTagSource("callout", "capture")}\\n?(${NO_CONTAINER_BODY})<\\/callout>`,
   "g"
 );
 var INNERMOST_COLUMNS_RE = new RegExp(
-  `([\\t ]*)<columns[^>]*>\\n?(${NO_CONTAINER_BODY})<\\/columns>`,
+  `([\\t ]*)${nfmOpenTagSource("columns")}\\n?(${NO_CONTAINER_BODY})<\\/columns>`,
+  "g"
+);
+var COLUMN_WRAP_RE = new RegExp(
+  `[\\t ]*${nfmOpenTagSource("column", "capture")}\\n?([\\s\\S]*?)[\\t ]*<\\/column>\\n?`,
   "g"
 );
-var COLUMN_WRAP_RE = /[\t ]*<column(?!s)[^>]*>\n?([\s\S]*?)[\t ]*<\/column>\n?/g;
 function reindentLines(text, indent) {
   if (!indent) return text;
   return text.split("\n").map((line) => line === "" ? line : indent + line).join("\n");
@@ -5819,13 +6945,15 @@ function parseDesignAttrs(attrs) {
   const color = /\bcolor="([^"]*)"/.exec(attrs)?.[1];
   return { icon: icon || void 0, color: color || void 0 };
 }
+function parseColumnRatio(attrs) {
+  return /\bratio="(\d+(?:\.\d+)?)"/.exec(attrs)?.[1];
+}
 function toggleToCallout(title, rawBody, color) {
   const body = dedentContainerBody(rawBody);
   const head = ["> [!toggle]-", title.trim(), color ? toggleColorMarker(color) : ""].filter((part) => part !== "").join(" ");
   if (body.trim() === "") return head;
-  const calloutBody = body.split("\n").map((line) => line.trim() ? `> ${line}` : ">").join("\n");
   return `${head}
-${calloutBody}`;
+${quoteCalloutBody(body)}`;
 }
 function flattenColumns(body) {
   const cols = [];
@@ -5834,13 +6962,16 @@ function flattenColumns(body) {
   let matched = false;
   while ((m = re.exec(body)) !== null) {
     matched = true;
-    const col = dedentContainerBody(m[1]);
-    if (col.trim() !== "") cols.push(col);
+    cols.push({ ratio: parseColumnRatio(m[1] ?? ""), body: dedentContainerBody(m[2]) });
   }
   if (!matched) return dedentContainerBody(body);
-  if (cols.length === 0) return "";
-  return [COLUMN_LIST_START, ...cols.map((c) => `${COLUMN_SEP}
-${c}`), COLUMN_LIST_END].join("\n");
+  if (cols.every((c) => c.body.trim() === "")) return "";
+  return [
+    COLUMN_LIST_START,
+    ...cols.map((c) => `${columnMarker(c.ratio)}
+${c.body}`),
+    COLUMN_LIST_END
+  ].join("\n");
 }
 function convertContainers(content) {
   let result = content;
@@ -5861,39 +6992,30 @@ function convertContainers(content) {
     );
     if (result === before) break;
   }
-  return stripQuotedColumnMarkers(result);
+  return result;
 }
-var QUOTED_COLUMN_EDGE_RE = new RegExp(
-  `^(?:>[ \\t]?)+[ \\t]*%%${MARKER_BRAND_RE}:column-list:(?:start|end)%%[ \\t]*\\n?`,
-  "gm"
-);
-var QUOTED_COLUMN_SEP_RE = new RegExp(
-  `^((?:>[ \\t]?)+)[ \\t]*%%${MARKER_BRAND_RE}:column%%[ \\t]*$`,
-  "gm"
-);
-var QUOTED_COLUMN_INLINE_RE = new RegExp(
-  `[ \\t]*%%${MARKER_BRAND_RE}:column(?:-list:(?:start|end))?%%`,
-  "g"
+var COLUMN_MARKER_LINE_RE = new RegExp(
+  `^${CONTAINER_PREFIX_SOURCE}(?:${COLUMN_SEP_SOURCE}|%%${MARKER_BRAND_RE}:column-list:(?:start|end)%%)[\\t ]*$`
 );
-function stripQuotedColumnMarkers(content) {
-  return content.replace(QUOTED_COLUMN_EDGE_RE, "").replace(QUOTED_COLUMN_SEP_RE, (_m, prefix) => prefix.trimEnd()).replace(
-    /^(?:>[ \t]?).*%%.*$/gm,
-    (line) => line.replace(QUOTED_COLUMN_INLINE_RE, "").trimEnd()
-  );
+var QUOTED_LINE_RE = /^[\t ]*>/;
+function isStructuralFirstLine(line) {
+  return COLUMN_MARKER_LINE_RE.test(line) || QUOTED_LINE_RE.test(line);
 }
 function calloutBodyToObsidian(body, style) {
   const lines = dedentContainerBody(body).split("\n").filter((l, i, arr) => !(i === 0 && l === "") && !(i === arr.length - 1 && l === ""));
-  const firstLine = lines[0] ?? "";
+  const titleIndex = isStructuralFirstLine(lines[0] ?? "") ? -1 : 0;
+  const firstLine = titleIndex === 0 ? lines[0] ?? "" : "";
   const emojiMatch = style?.icon || style?.color ? null : /^([\p{Emoji}️‍]+)\s*(.*)/u.exec(firstLine);
   const rawIcon = style?.icon ?? (emojiMatch ? emojiMatch[1] : void 0);
   const icon = rawIcon !== void 0 && /^https?:\/\//i.test(rawIcon) ? void 0 : rawIcon;
   const type = icon ? emojiToCalloutType(icon) : "note";
   const title = emojiMatch ? emojiMatch[2] : firstLine;
-  const rest = lines.slice(1).join("\n").trim();
+  const rest = lines.slice(titleIndex + 1).join("\n").replace(/^(?:[\t ]*\n)+/, "").replace(/\n[\t ]*$/, "");
   const needsMarker = Boolean(style?.color) || icon !== void 0 && calloutTypeToEmoji(type) !== icon;
   const styleTail = needsMarker ? ` ${calloutStyleMarker({ icon, color: style?.color })}` : "";
   const calloutTitle = title ? `> [!${type}] ${title}${styleTail}` : `> [!${type}]${styleTail}`;
-  const calloutBody = rest ? "\n" + rest.split("\n").map((line) => line.trim() ? `> ${line}` : ">").join("\n") : "";
+  const calloutBody = rest.trim() ? `
+${quoteCalloutBody(rest)}` : "";
   return calloutTitle + calloutBody;
 }
 function convertFencedCallouts(content) {
@@ -5908,6 +7030,10 @@ function convertPageMentions(content) {
     /<mention-page\s+url="https?:\/\/(?:[a-z]+\.)?notion\.(?:so|com)\/(?:p\/)?([a-f0-9]{32})"[^>]*?(?:\/>|>[\s\S]*?<\/mention-page>)/g,
     (_match, id) => `[[notion:${id}]]`
   );
+  result = result.replace(NOTION_LABELED_PAGE_LINK_RE, (_match, label, id) => {
+    const normalized = id.replace(/-/g, "");
+    return `[[notion:${normalized}|${label}]]`;
+  });
   return result;
 }
 function convertUserMentions(content) {
@@ -5918,6 +7044,10 @@ function convertDateMentions(content) {
     return end ? `${start} \u2192 ${end}` : start;
   });
 }
+function degradeLink(label, url, marker) {
+  return `[${label}](${url.replace(/\(/g, "%28").replace(/\)/g, "%29")})${marker}`;
+}
+var DEGRADE_LINK_SOURCE = "(?:\\[[^\\]]*\\]\\([^)]*\\))?";
 function preserveUnknownBlocks(content) {
   let result = content.replace(NOTION_UNKNOWN_RE, (_match, id, attrs) => {
     const typeMatch = /type="([^"]*)"/.exec(attrs);
@@ -5930,34 +7060,48 @@ function preserveUnknownBlocks(content) {
     const blockType = altMatch?.[1] ?? "bookmark";
     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 degradeLink(label, url, marker);
   });
   return result;
 }
-function convertSyncedBlockRef(content) {
-  const unwrap = (match, openRe, closeRe) => match.replace(openRe, "").replace(closeRe, "").split("\n").map((l) => l.replace(/^\t/, "")).join("\n").trim();
-  let result = content.replace(
-    /<synced_block_reference([^>]*)>[\s\S]*?<\/synced_block_reference>/g,
-    (match, attrs) => {
-      const inner = unwrap(match, /<synced_block_reference[^>]*>\n?/, /<\/synced_block_reference>/);
-      const url = /url="([^"]*)"/.exec(attrs)?.[1];
-      if (!url) return inner;
-      return `${syncedStartMarker("ref", url)}
-${inner}
-${SYNCED_END}`;
-    }
-  );
+var NOTION_TOC_RE = /<table_of_contents(?:\s+color="([^"]*)")?\s*\/>/g;
+var NOTION_EMBED_RE = /<embed\s+src="([^"]*)"[^>]*>\s*<\/embed>/g;
+var NOTION_UNKNOWN_MENTION_RE = /<unknown_mention\s+url="([^"]*)"([^>]*?)\/>/g;
+function preserveNfmOnlyBlocks(content) {
+  let result = content.replace(NOTION_TOC_RE, (_match, color) => tocMarker(color));
   result = result.replace(
-    /<synced_block([^>]*)>[\s\S]*?<\/synced_block>/g,
-    (match, attrs) => {
-      const inner = unwrap(match, /<synced_block[^>]*>\n?/, /<\/synced_block>/);
-      const url = /url="([^"]*)"/.exec(attrs)?.[1];
-      if (!url) return inner;
-      return `${syncedStartMarker("orig", url)}
+    NOTION_EMBED_RE,
+    (_match, src) => degradeLink("\u{1F517} Embed", src, embedMarker(src))
+  );
+  return result.replace(
+    NOTION_UNKNOWN_MENTION_RE,
+    (_match, url, attrs) => unknownMentionMarker(url, /alt="([^"]*)"/.exec(attrs)?.[1])
+  );
+}
+function convertSyncedBlockRef(content) {
+  const rebuild = (match, indent, attrs, kind, openRe, closeRe) => {
+    const inner = dedentContainerBody(
+      match.slice(indent.length).replace(openRe, "").replace(closeRe, "")
+    );
+    const url = /url="([^"]*)"/.exec(attrs)?.[1];
+    if (!url) return reindentLines(inner, indent);
+    return reindentLines(`${syncedStartMarker(kind, url)}
 ${inner}
-${SYNCED_END}`;
-    }
+${SYNCED_END}`, indent);
+  };
+  const replaceSynced = (text, name, kind) => text.replace(
+    new RegExp(`([\\t ]*)${nfmOpenTagSource(name, "capture")}[\\s\\S]*?<\\/${name}>`, "g"),
+    (match, indent, attrs) => rebuild(
+      match,
+      indent,
+      attrs,
+      kind,
+      new RegExp(`${nfmOpenTagSource(name)}\\n?`),
+      new RegExp(`</${name}>`)
+    )
   );
+  let result = replaceSynced(content, "synced_block_reference", "ref");
+  result = replaceSynced(result, "synced_block", "orig");
   return result;
 }
 var SYNCED_MARKER_PAIR_RE = new RegExp(
@@ -5975,7 +7119,7 @@ function restoreSyncedBlocks(content) {
     }
     if (!url) return body.trim();
     const tag = kind === "ref" ? "synced_block_reference" : "synced_block";
-    const indented = body.trim().split("\n").map((l) => l.length > 0 ? `	${l}` : l).join("\n");
+    const indented = indentContainerBody(body.trim());
     return `<${tag} url="${url}">
 ${indented}
 </${tag}>`;
@@ -6025,24 +7169,31 @@ function convertSpans(content) {
 }
 var TOGGLE_COLOR_MARKER_RE = new RegExp(`\\s*%%${MARKER_BRAND_RE}:toggle-color:([a-z_]+)%%`);
 function convertTogglesToHtml(content) {
-  const calloutToggleRe = /^> \[!toggle\]-[ \t]*(.*)\n?((?:>.*\n?)*)/gm;
+  const calloutToggleRe = /^([ \t]{0,3})> \[!toggle\]-[ \t]*(.*)((?:\n\1>.*)*)/gm;
   let result = content;
   let prev = "";
   let safety = 0;
   while (result !== prev && safety++ < 100) {
     prev = result;
-    result = result.replace(calloutToggleRe, (_match, title, body) => {
-      const colorMatch = TOGGLE_COLOR_MARKER_RE.exec(title);
-      const cleanTitle = colorMatch ? title.replace(TOGGLE_COLOR_MARKER_RE, "") : title;
-      const attrs = colorMatch ? ` color="${colorMatch[1]}"` : "";
-      const bodyText = body.split("\n").map((line) => line.replace(/^>\s?/, "")).join("\n").trim();
-      return `<details${attrs}>
+    result = result.replace(
+      calloutToggleRe,
+      (_match, indent, rawTitle, body) => {
+        const { depth, title } = readCalloutIndentDepth(indent, rawTitle);
+        const colorMatch = TOGGLE_COLOR_MARKER_RE.exec(title);
+        const cleanTitle = colorMatch ? title.replace(TOGGLE_COLOR_MARKER_RE, "") : title;
+        const attrs = colorMatch ? ` color="${colorMatch[1]}"` : "";
+        const bodyText = restoreBodyIndent(
+          body.split("\n").map((line) => line.replace(/^[ \t]*>\s?/, "")).join("\n")
+        ).trim();
+        const html = `<details${attrs}>
 <summary>${cleanTitle.trim()}</summary>
 
 ${bodyText}
 
 </details>`;
-    });
+        return applyCalloutIndent(html, depth);
+      }
+    );
   }
   const startRe = new RegExp(escapeRegex3(TOGGLE_START), "g");
   const endRe = new RegExp(escapeRegex3(TOGGLE_END), "g");
@@ -6064,7 +7215,7 @@ ${body}
     result = result.slice(0, startIdx) + html + result.slice(endIdx + TOGGLE_END.length);
   }
   result = result.replace(startRe, "").replace(endRe, "");
-  result = result.replace(/^(<\/details>)(?!\n|$)/gm, "$1\n");
+  result = result.replace(/^([\t ]*<\/details>)(?!\n|$)/gm, "$1\n");
   return result;
 }
 function findMatchingEnd(content, startFrom) {
@@ -6103,10 +7254,12 @@ function convertObsidianCallouts(content) {
   const result = [];
   let i = 0;
   while (i < lines.length) {
-    const headerMatch = /^> \[!(\w+)\]([-+])?[ \t]*(.*)$/.exec(lines[i]);
-    const type = headerMatch?.[1]?.toLowerCase();
+    const headerMatch = /^([ \t]{0,3})> \[!(\w+)\]([-+])?[ \t]*(.*)$/.exec(lines[i]);
+    const type = headerMatch?.[2]?.toLowerCase();
     if (headerMatch && type !== "toggle" && type !== "tab") {
-      let title = headerMatch[3];
+      const indentRead = readCalloutIndentDepth(headerMatch[1], headerMatch[4]);
+      const depth = indentRead.depth;
+      let title = indentRead.title;
       let style = {};
       const styleMatch = CALLOUT_STYLE_MARKER_RE.exec(title);
       if (styleMatch) {
@@ -6117,21 +7270,23 @@ function convertObsidianCallouts(content) {
       }
       const bodyLines = [];
       i++;
-      while (i < lines.length && (lines[i] === ">" || lines[i].startsWith("> "))) {
-        bodyLines.push(lines[i] === ">" ? "" : lines[i].slice(2));
+      const quote = `${headerMatch[1]}>`;
+      while (i < lines.length && (lines[i] === quote || lines[i].startsWith(`${quote} `))) {
+        bodyLines.push(lines[i] === quote ? "" : lines[i].slice(quote.length + 1));
         i++;
       }
-      const innerConverted = convertObsidianCallouts(convertTogglesToHtml(bodyLines.join("\n")));
+      const innerConverted = convertObsidianCallouts(
+        convertTogglesToHtml(restoreBodyIndent(bodyLines.join("\n")))
+      );
       const attrs = `${style.icon ? ` icon="${style.icon}"` : ""}${style.color ? ` color="${style.color}"` : ""}`;
-      result.push(`<callout${attrs}>`);
+      const block = [`<callout${attrs}>`];
       const cleanTitle = title.trim();
-      if (cleanTitle) result.push(`	${cleanTitle}`);
+      if (cleanTitle) block.push(`	${cleanTitle}`);
       if (innerConverted.trim() !== "") {
-        for (const line of innerConverted.split("\n")) {
-          result.push(line === "" ? "" : `	${line}`);
-        }
+        block.push(...indentContainerBody(innerConverted).split("\n"));
       }
-      result.push("</callout>");
+      block.push("</callout>");
+      result.push(...applyCalloutIndent(block.join("\n"), depth).split("\n"));
     } else {
       result.push(lines[i]);
       i++;
@@ -6162,11 +7317,11 @@ function emojiToCalloutType(emoji) {
 function calloutTypeToEmoji(type) {
   return TYPE_EMOJI_MAP[type.toLowerCase()];
 }
-function escapeRegex3(str) {
-  return str.replace(/[.*+?^${}()|[\]\\]/g, "\\$&");
+function escapeRegex3(str2) {
+  return str2.replace(/[.*+?^${}()|[\]\\]/g, "\\$&");
 }
 var NOTION_PAGE_LINK_RE = /<page url="[^"]*">([\s\S]*?)<\/page>/g;
-var NOTION_EMPTY_BLOCK_RE = /^(?:>[\t ]*)*[\t ]*<empty-block\/>\n?/gm;
+var NOTION_EMPTY_BLOCK_RE = /^([\t ]*(?:>[\t ]*)*)<empty-block\/>[\t ]*\n?/gm;
 function convertPageLinks(content) {
   return content.replace(NOTION_PAGE_LINK_RE, (_match, text) => {
     const cleaned = text.replace(/\*\*/g, "").trim();
@@ -6178,10 +7333,10 @@ function convertDatabaseBlocks(content) {
     /<database\b([^>]*)>([\s\S]*?)<\/database>/g,
     (_match, attrs, title) => {
       const clean = title.trim();
-      const placeholder = `**${clean}** *(Notion DB)*`;
+      const placeholder2 = `**${clean}** *(Notion DB)*`;
       const idMatch = /\burl="[^"]*?([a-f0-9]{32})[^"]*"/.exec(attrs);
-      if (!idMatch?.[1]) return placeholder;
-      return `${placeholder}${compactMarker(
+      if (!idMatch?.[1]) return placeholder2;
+      return `${placeholder2}${compactMarker(
         `child-database:id=${idMatch[1]}&title=${encodeURIComponent(clean)}`
       )}`;
     }
@@ -6191,14 +7346,14 @@ var TRAILING_BLOCK_COLOR_RE = /[ \t]*\{color="([a-z_]+)"\}(?=[ \t]*$)/gm;
 function convertBlockColorAttrs(content) {
   return content.replace(TRAILING_BLOCK_COLOR_RE, (_m, color) => ` ${blockColorMarker(color)}`).replace(/\s*\{color="[^"]*"\}/g, "");
 }
-var CALLOUT_HEAD_RE = /^((?:> )*)> \[!\w+\][-+]?/;
+var CALLOUT_HEAD_RE2 = /^([\t ]*)((?:> )*)> \[!\w+\][-+]?/;
 function separateAdjacentCallouts(content) {
   const lines = content.split("\n");
   const out = [];
   for (const line of lines) {
-    const head = CALLOUT_HEAD_RE.exec(line);
+    const head = CALLOUT_HEAD_RE2.exec(line);
     if (head && out.length > 0) {
-      const parentPrefix = head[1];
+      const parentPrefix = `${head[1]}${head[2]}`;
       const prev = out[out.length - 1];
       if (prev.startsWith(`${parentPrefix}>`)) {
         out.push(parentPrefix.trimEnd());
@@ -6208,8 +7363,13 @@ function separateAdjacentCallouts(content) {
   }
   return out.join("\n");
 }
+var QUOTE_ONLY_PREFIX_RE = /^[\t ]*(?:>[\t ]*)+$/;
 function removeEmptyBlocks(content) {
-  return content.replace(NOTION_EMPTY_BLOCK_RE, "\n");
+  return content.replace(
+    NOTION_EMPTY_BLOCK_RE,
+    (_match, prefix) => QUOTE_ONLY_PREFIX_RE.test(prefix) ? `${prefix.trimEnd()}
+` : "\n"
+  );
 }
 var NOTION_INLINE_MATH_RE = /\$`([^`]+)`\$/g;
 var NOTION_BLOCK_MATH_RE = /\$\$\n```\n([\s\S]*?)\n```\n\$\$/g;
@@ -6229,14 +7389,22 @@ $$`;
 function unescapeNotionChars(content) {
   return content.replace(/\\~/g, "~").replace(/\\\^/g, "^");
 }
-var NOTION_TABLE_RE = /<table[^>]*>([\s\S]*?)<\/table>/g;
-var TABLE_ROW_RE2 = /<tr>([\s\S]*?)<\/tr>/g;
+var NOTION_TABLE_RE = new RegExp(
+  `^(${CONTAINER_PREFIX_SOURCE})${nfmOpenTagSource("table")}([\\s\\S]*?)</table>`,
+  "gm"
+);
+var TABLE_ROW_RE2 = /<tr[^>]*>([\s\S]*?)<\/tr>/g;
 var TABLE_CELL_RE = /<t[dh][^>]*>([\s\S]*?)<\/t[dh]>/g;
 function isAlignmentRow(cells) {
   return cells.every((c) => /^:?-{2,}:?$/.test(c.trim()));
 }
+function toTableCell(raw) {
+  return raw.trim().replace(/\r?\n/g, "<br>").replace(/(?<!\\)\|/g, "\\|");
+}
 function convertNotionTables(content) {
-  return content.replace(NOTION_TABLE_RE, (_match, tableBody) => {
+  const code = codeInteriorRanges(content);
+  return content.replace(NOTION_TABLE_RE, (_match, prefix, tableBody, offset) => {
+    if (isInsideRanges(code, offset)) return _match;
     const rows = [];
     let rowMatch;
     const rowRe = new RegExp(TABLE_ROW_RE2.source, TABLE_ROW_RE2.flags);
@@ -6245,7 +7413,7 @@ function convertNotionTables(content) {
       let cellMatch;
       const cellRe = new RegExp(TABLE_CELL_RE.source, TABLE_CELL_RE.flags);
       while ((cellMatch = cellRe.exec(rowMatch[1])) !== null) {
-        cells.push(cellMatch[1].trim());
+        cells.push(toTableCell(cellMatch[1]));
       }
       if (!isAlignmentRow(cells)) {
         rows.push(cells);
@@ -6262,7 +7430,7 @@ function convertNotionTables(content) {
         lines.push(`| ${padded.map(() => "---").join(" | ")} |`);
       }
     }
-    return lines.join("\n");
+    return lines.map((line) => prefix + line).join("\n");
   });
 }
 var OBSIDIAN_MEDIA_AUDIO_RE = /\[🔊\s*([^\]]*)\]\(([^)]+)\)/g;
@@ -6281,16 +7449,15 @@ function restoreMediaTags(content) {
   result = result.replace(OBSIDIAN_MEDIA_FILE_RE, restore("file"));
   return result;
 }
-var OBSIDIAN_TAB_RE = /^> \[!tab\]\s*(.+)\n((?:> .*\n?)*)/gm;
+var OBSIDIAN_TAB_RE = /^> \[!tab\]\s*(.+)((?:\n> .*)*)/gm;
 function restoreTabBlocks(content) {
-  const result = content.replace(OBSIDIAN_TAB_RE, (_match, title, body) => {
+  return content.replace(OBSIDIAN_TAB_RE, (_match, title, body) => {
     const unquoted = body.split("\n").map((line) => line.replace(/^> /, "")).join("\n").trim();
     return `<tab title="${title}">${unquoted}</tab>`;
   });
-  return result.replace(/(<\/tab>)(?!\n|$)/g, "$1\n");
 }
 var OBSIDIAN_UNKNOWN_RE = new RegExp(
-  `(?:\\[[^\\]]*\\]\\([^)]*\\))?%%${MARKER_BRAND_RE}:unknown:id=([^&]+)&type=([^%]+)%%`,
+  `${DEGRADE_LINK_SOURCE}%%${MARKER_BRAND_RE}:unknown:id=([^&]+)&type=([^%]+)%%`,
   "g"
 );
 function restoreUnknownBlocks(content) {
@@ -6302,6 +7469,30 @@ function restoreUnknownBlocks(content) {
     return `<unknown id="${id}" type="${type}"/>`;
   });
 }
+var OBSIDIAN_TOC_RE = new RegExp(`%%${MARKER_BRAND_RE}:toc(?::color=([^%]+))?%%`, "g");
+var OBSIDIAN_EMBED_RE = new RegExp(
+  `${DEGRADE_LINK_SOURCE}%%${MARKER_BRAND_RE}:embed:src=(${MARKER_PAYLOAD_CHAR}+)%%`,
+  "g"
+);
+var OBSIDIAN_UNKNOWN_MENTION_RE = new RegExp(
+  `%%${MARKER_BRAND_RE}:unknown-mention:url=(${MARKER_PAYLOAD_CHAR}+)%%`,
+  "g"
+);
+function restoreNfmOnlyBlocks(content) {
+  let result = content.replace(
+    OBSIDIAN_TOC_RE,
+    (_match, color) => color ? `<table_of_contents color="${color}"/>` : `<table_of_contents/>`
+  );
+  result = result.replace(
+    OBSIDIAN_EMBED_RE,
+    (_match, src) => `<embed src="${decodeURIComponent(src)}"></embed>`
+  );
+  return result.replace(OBSIDIAN_UNKNOWN_MENTION_RE, (_match, payload) => {
+    const [url, alt] = payload.split("&alt=");
+    const altAttr = alt ? ` alt="${decodeURIComponent(alt)}"` : "";
+    return `<unknown_mention url="${decodeURIComponent(url ?? "")}"${altAttr}/>`;
+  });
+}
 var OBSIDIAN_COLOR_RE = new RegExp(
   `%%${MARKER_BRAND_RE}:color:([^%]+)%%([\\s\\S]*?)%%\\/color%%`,
   "g"
@@ -6327,29 +7518,51 @@ var OBSIDIAN_BLOCK_COLOR_RE = new RegExp(
 function restoreBlockColorMarkers(content) {
   return content.replace(OBSIDIAN_BLOCK_COLOR_RE, (_m, color) => ` {color="${color}"}`);
 }
-var COLUMN_REGION_RE = new RegExp(
-  `^${escapeRegex3(COLUMN_LIST_START)}[ \\t]*\\n([\\s\\S]*?)\\n?^${escapeRegex3(COLUMN_LIST_END)}[ \\t]*$\\n?`,
+var INNERMOST_COLUMN_REGION_RE = new RegExp(
+  `^([ \\t]*)${escapeRegex3(COLUMN_LIST_START)}[ \\t]*\\n((?:(?!^[ \\t]*${escapeRegex3(COLUMN_LIST_START)})[\\s\\S])*?)\\n?^[ \\t]*${escapeRegex3(COLUMN_LIST_END)}[ \\t]*$\\n?`,
   "gm"
 );
-function indentColumnLines(text) {
-  return text.split("\n").map((line) => line === "" ? "" : `	${line}`).join("\n");
+function splitColumnSegments(inner) {
+  const sepRe = new RegExp(`^[ \\t]*${COLUMN_SEP_SOURCE}[ \\t]*$`, "gm");
+  const segments = [];
+  let cursor = 0;
+  let pending = { ratio: void 0, body: "" };
+  let m;
+  while ((m = sepRe.exec(inner)) !== null) {
+    pending.body = inner.slice(cursor, m.index);
+    segments.push(pending);
+    pending = { ratio: m[1], body: "" };
+    cursor = m.index + m[0].length;
+  }
+  pending.body = inner.slice(cursor);
+  segments.push(pending);
+  return segments.map((s) => ({ ...s, body: s.body.replace(/^\n/, "").replace(/\n$/, "") }));
 }
 function reassembleColumns(content) {
-  const sepRe = new RegExp(`^${escapeRegex3(COLUMN_SEP)}[ \\t]*$`, "m");
-  let result = content.replace(COLUMN_REGION_RE, (_m, inner) => {
-    const cols = inner.split(new RegExp(sepRe.source, "gm")).map((c) => c.replace(/^\n/, "").replace(/\n$/, "")).filter((c) => c.trim() !== "");
-    if (cols.length === 0) return "";
-    const parts = cols.map((c) => `<column>
-${indentColumnLines(c)}
-</column>`).join("\n");
-    return `<columns>
-${indentColumnLines(parts)}
-</columns>
+  let result = content;
+  let safety = 0;
+  while (result.includes(COLUMN_LIST_START) && safety++ < 100) {
+    const before = result;
+    result = result.replace(INNERMOST_COLUMN_REGION_RE, (_m, indent, inner) => {
+      const segments = splitColumnSegments(indent ? dedentContainerBody(inner) : inner);
+      const cols = segments[0]?.body.trim() === "" ? segments.slice(1) : segments;
+      if (cols.every((c) => c.body.trim() === "")) return "";
+      const parts = cols.map(
+        (c) => `<column${c.ratio ? ` ratio="${c.ratio}"` : ""}>
+${indentContainerBody(c.body)}
+</column>`
+      ).join("\n");
+      const block = `<columns>
+${indentContainerBody(parts)}
+</columns>`;
+      return `${indent ? indentContainerBody(block, indent) : block}
 `;
-  });
+    });
+    if (result === before) break;
+  }
   result = result.replace(
     new RegExp(
-      `^[>\\t ]*%%${MARKER_BRAND_RE}:(?:column-list:start|column-list:end|column)%%[ \\t]*\\n?`,
+      `^[>\\t ]*(?:%%${MARKER_BRAND_RE}:column-list:(?:start|end)%%|${COLUMN_SEP_SOURCE})[ \\t]*\\n?`,
       "gm"
     ),
     ""
@@ -6361,17 +7574,14 @@ function unescapePipes(content) {
   const result = [];
   let inTable = false;
   for (const line of lines) {
-    if (/^\|.*\|$/.test(line.trim()) || /^\|[\s-|]+\|$/.test(line.trim())) {
+    const trimmed = splitContainerPrefix(line).body.trim();
+    if (/^\|.*\|$/.test(trimmed) || /^\|[\s-|]+\|$/.test(trimmed)) {
       inTable = true;
       result.push(line);
-    } else {
-      if (inTable && line.trim() === "") {
-        inTable = false;
-      } else if (!/^\|/.test(line.trim())) {
-        inTable = false;
-      }
-      result.push(inTable ? line : line.replace(/\\\|/g, "|"));
+      continue;
     }
+    if (!trimmed.startsWith("|")) inTable = false;
+    result.push(inTable ? line : line.replace(/\\\|/g, "|"));
   }
   return result.join("\n");
 }
@@ -6383,7 +7593,8 @@ function ensureCalloutContinuity(content) {
     if (line.trim() === "" && i > 0 && i < lines.length - 1) {
       const prev = result[result.length - 1] ?? "";
       const next = lines[i + 1] ?? "";
-      if (/^>/.test(prev) && /^>/.test(next) && !/^> \[!/.test(next)) {
+      const joinable = (s) => /^>/.test(s) && !MEDIA_PLACEHOLDER_LINE_RE.test(s);
+      if (joinable(prev) && joinable(next) && !/^> \[!/.test(next)) {
         result.push(">");
         continue;
       }
@@ -6392,6 +7603,7 @@ function ensureCalloutContinuity(content) {
   }
   return result.join("\n");
 }
+var MEDIA_PLACEHOLDER_LINE_RE = new RegExp(`^${MEDIA_PLACEHOLDER_HEAD}`);
 var DatabaseSyncer = class {
   constructor(config, stateDb, notionClient, vaultFs, pipeline, imageHandler) {
     this.config = config;
@@ -6430,10 +7642,11 @@ var DatabaseSyncer = class {
   async pullAll() {
     const databases = this.config.notion.databases;
     if (!databases || databases.length === 0) {
-      return { created: 0, updated: 0, conflicts: [], failed: [], writtenPaths: [] };
+      return { created: 0, updated: 0, restored: 0, conflicts: [], failed: [], writtenPaths: [] };
     }
     let created = 0;
     let updated = 0;
+    let restored = 0;
     const conflicts = [];
     const failed = [];
     const writtenPaths = [];
@@ -6442,6 +7655,7 @@ var DatabaseSyncer = class {
         const result = await this.pullDatabase(dbConfig);
         created += result.created;
         updated += result.updated;
+        restored += result.restored;
         conflicts.push(...result.conflicts);
         failed.push(...result.failed);
         writtenPaths.push(...result.writtenPaths);
@@ -6454,12 +7668,12 @@ var DatabaseSyncer = class {
         });
       }
     }
-    return { created, updated, conflicts, failed, writtenPaths };
+    return { created, updated, restored, conflicts, failed, writtenPaths };
   }
   async pushAll() {
     const databases = this.config.notion.databases;
     if (!databases || databases.length === 0) {
-      return { created: 0, updated: 0, conflicts: [], failed: [], writtenPaths: [] };
+      return { created: 0, updated: 0, restored: 0, conflicts: [], failed: [], writtenPaths: [] };
     }
     let created = 0;
     let updated = 0;
@@ -6479,7 +7693,7 @@ var DatabaseSyncer = class {
         });
       }
     }
-    return { created, updated, conflicts: [], failed, writtenPaths: [] };
+    return { created, updated, restored: 0, conflicts: [], failed, writtenPaths: [] };
   }
   async pullDatabase(dbConfig, opts) {
     const pages = await this.notionClient.queryAllDatabasePages(
@@ -6496,6 +7710,7 @@ var DatabaseSyncer = class {
         return {
           created: 0,
           updated: 0,
+          restored: 0,
           conflicts: [],
           failed: [],
           writtenPaths: [],
@@ -6510,28 +7725,35 @@ var DatabaseSyncer = class {
     await this.generateBaseFile(dbConfig, viewsConfig);
     let created = 0;
     let updated = 0;
+    let restored = 0;
     const conflicts = [];
     const failed = [];
     const writtenPaths = [];
     for (const page of pages) {
       try {
         const record = this.stateDb.getByNotionId(page.id);
+        let restoring = false;
         if (record) {
           const misplaced = !isDirectDbRowPath(dbConfig.localFolder, record.obsidianPath);
-          if (page.last_edited_time === record.notionLastEdited && !misplaced) continue;
-          const outcome = await this.pullDatabasePage(page, dbConfig);
-          if (outcome.action === "written") {
-            updated++;
-            writtenPaths.push(outcome.path);
-          } else if (outcome.action === "conflict") {
-            conflicts.push(outcome.conflict);
+          if (page.last_edited_time === record.notionLastEdited && !misplaced) {
+            if (await this.vaultFs.exists(record.obsidianPath)) continue;
+            restoring = true;
           }
-        } else {
-          const outcome = await this.pullDatabasePage(page, dbConfig);
+        }
+        const outcome = await withDeadline(
+          () => this.pullDatabasePage(page, dbConfig),
+          this.config.advanced.itemTimeoutMs,
+          `pull ${dbConfig.localFolder}/${page.id}`
+        );
+        if (!record) {
           created++;
-          if (outcome.action === "written") {
-            writtenPaths.push(outcome.path);
-          }
+          if (outcome.action === "written") writtenPaths.push(outcome.path);
+        } else if (outcome.action === "written") {
+          if (restoring) restored++;
+          else updated++;
+          writtenPaths.push(outcome.path);
+        } else if (outcome.action === "conflict") {
+          conflicts.push(outcome.conflict);
         }
       } catch (error) {
         failed.push({
@@ -6542,9 +7764,9 @@ var DatabaseSyncer = class {
       }
     }
     getLogger().debug(
-      `[DB Sync] ${dbConfig.localFolder}: ${created} \uC0DD\uC131, ${updated} \uC5C5\uB370\uC774\uD2B8, ${conflicts.length} \uCDA9\uB3CC`
+      `[DB Sync] ${dbConfig.localFolder}: ${created} \uC0DD\uC131, ${updated} \uC5C5\uB370\uC774\uD2B8, ${restored} \uBCF5\uC6D0, ${conflicts.length} \uCDA9\uB3CC`
     );
-    return { created, updated, conflicts, failed, writtenPaths };
+    return { created, updated, restored, conflicts, failed, writtenPaths };
   }
   async pullDatabaseViews(dbConfig, force = false) {
     try {
@@ -6760,14 +7982,18 @@ var DatabaseSyncer = class {
     );
     if (existingRecord) {
       let localContent = "";
+      let localExists = true;
+      const readPath = recordPath ?? filePath;
       try {
-        localContent = await this.vaultFs.readFile(recordPath ?? filePath);
+        localContent = await this.vaultFs.readFile(readPath);
       } catch {
         localContent = "";
+        localExists = await this.vaultFs.exists(readPath);
       }
       const resolution = resolvePullConflict({
         record: existingRecord,
         localContent,
+        localExists,
         remoteContent: finalContent,
         remoteChange: {
           pageId: page.id,
@@ -6827,101 +8053,24 @@ var DatabaseSyncer = class {
   }
   async pushDatabase(dbConfig) {
     const schema = await this.notionClient.getDatabaseSchema(dbConfig.databaseId);
-    this.propertyMapper.loadSchema(schema);
-    const allFiles = await this.vaultFs.listMarkdownFiles();
-    const dbFiles = selectDbRowFiles(allFiles, dbConfig.localFolder);
-    const livePaths = new Set(dbFiles.map((f) => f.path));
-    const orphanByHash = this.buildOrphanHashIndex(dbConfig.databaseId, livePaths);
-    let created = 0;
-    let updated = 0;
-    const failed = [];
-    for (const file of dbFiles) {
-      try {
-        const content = await this.vaultFs.readFile(file.path);
-        const hash = computeHash(content);
-        const record = this.stateDb.getByPath(file.path);
-        if (record?.contentHash === hash) continue;
-        const parsed = matter(content);
-        const frontmatter = parsed.data;
-        const body = parsed.content;
-        const title = frontmatter.title ?? extractTitleFromPath(file.path);
-        delete frontmatter.title;
-        const notionProps = this.propertyMapper.toNotionProperties(frontmatter, title);
-        const enhanced = obsidianToNotionEnhanced(body.trim());
-        if (record?.notionPageId) {
-          try {
-            await this.notionClient.updatePageProperties(record.notionPageId, notionProps);
-            await this.notionClient.replacePageMarkdown(record.notionPageId, enhanced);
-          } 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",
-            title,
-            markdown: enhanced,
-            properties: notionProps
-          });
-          this.stateDb.transaction(() => {
-            this.stateDb.upsert({
-              obsidianPath: file.path,
-              notionPageId: page.id,
-              notionParentId: dbConfig.databaseId,
-              contentHash: hash,
-              notionLastEdited: page.last_edited_time,
-              localLastModified: (/* @__PURE__ */ new Date()).toISOString(),
-              syncDirection: "both",
-              fileType: "db-row",
-              status: "synced",
-              baseSnapshot: Buffer.from(content, "utf-8")
-            });
-            this.stateDb.upsertWikilink({
-              obsidianPath: file.path,
-              notionPageId: page.id,
-              title,
-              aliases: extractAliases(frontmatter)
-            });
-          });
-          created++;
-        }
+    this.propertyMapper.loadSchema(schema);
+    const allFiles = await this.vaultFs.listMarkdownFiles();
+    const dbFiles = selectDbRowFiles(allFiles, dbConfig.localFolder);
+    const livePaths = new Set(dbFiles.map((f) => f.path));
+    const orphanByHash = this.buildOrphanHashIndex(dbConfig.databaseId, livePaths);
+    let created = 0;
+    let updated = 0;
+    const failed = [];
+    for (const file of dbFiles) {
+      try {
+        const outcome = await withDeadline(
+          () => this.pushDatabaseRow(file.path, dbConfig, orphanByHash),
+          this.config.advanced.itemTimeoutMs,
+          `push ${file.path}`
+        );
+        if (outcome.action === "created") created++;
+        else if (outcome.action === "updated") updated++;
+        else if (outcome.action === "failed") failed.push(outcome.failure);
       } catch (error) {
         failed.push({
           path: file.path,
@@ -6931,7 +8080,105 @@ var DatabaseSyncer = class {
       }
     }
     getLogger().debug(`[DB Sync] ${dbConfig.localFolder}: ${created} \uC0DD\uC131, ${updated} \uC5C5\uB370\uC774\uD2B8`);
-    return { created, updated, conflicts: [], failed, writtenPaths: [] };
+    return { created, updated, restored: 0, conflicts: [], failed, writtenPaths: [] };
+  }
+  /**
+   * db-row 파일 1건을 Notion 으로 밀어 올린다 — 생성·갱신·rename 재매핑·스킵을 모두 담당.
+   *
+   * 호출부의 루프에서 떼어낸 이유는 상한(`withDeadline`)을 걸 단위가 필요해서다(R9e).
+   * 그래서 결과는 카운터를 직접 건드리지 않고 {@link PushRowOutcome} 으로 돌려준다 —
+   * 상한에 걸린 행이 카운터를 절반만 올린 채 끊기는 일이 구조적으로 불가능해진다.
+   *
+   * 본문 push 실패만 `failed` 를 **반환**하고 나머지 예외는 그대로 던진다. 둘의 차이는
+   * 상태 처리에 있다: 전자는 레코드를 `error` 로 내려 해시 전진을 막아야 하므로 여기서
+   * 처리하고, 후자는 호출부의 catch 가 일괄 기록한다(기존 동작 그대로).
+   */
+  async pushDatabaseRow(filePath, dbConfig, orphanByHash) {
+    const content = await this.vaultFs.readFile(filePath);
+    const hash = computeHash(content);
+    const record = this.stateDb.getByPath(filePath);
+    if (record?.contentHash === hash) return { action: "skipped" };
+    const parsed = matter(content);
+    const frontmatter = parsed.data;
+    const body = parsed.content;
+    const title = frontmatter.title ?? extractTitleFromPath(filePath);
+    delete frontmatter.title;
+    const notionProps = this.propertyMapper.toNotionProperties(frontmatter, title);
+    const enhanced = obsidianToNotionEnhanced(body.trim());
+    if (record?.notionPageId) {
+      try {
+        await this.notionClient.updatePageProperties(record.notionPageId, notionProps);
+        await this.notionClient.replacePageMarkdown(record.notionPageId, enhanced);
+      } catch (error) {
+        this.stateDb.updateStatus(record.id, "error");
+        return {
+          action: "failed",
+          failure: {
+            path: filePath,
+            operation: "update",
+            error: error instanceof Error ? error.message : String(error)
+          }
+        };
+      }
+      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: filePath,
+          notionPageId: record.notionPageId,
+          title,
+          aliases: extractAliases(frontmatter)
+        });
+      });
+      return { action: "updated" };
+    }
+    const renamed = orphanByHash.get(hash);
+    if (renamed?.notionPageId) {
+      const movedPageId = renamed.notionPageId;
+      orphanByHash.delete(hash);
+      this.stateDb.transaction(() => {
+        this.stateDb.updatePath(renamed.id, filePath);
+        this.stateDb.updateHash(renamed.id, hash, Buffer.from(content, "utf-8"));
+        this.stateDb.updateStatus(renamed.id, "synced");
+        this.stateDb.upsertWikilink({
+          obsidianPath: filePath,
+          notionPageId: movedPageId,
+          title,
+          aliases: extractAliases(frontmatter)
+        });
+      });
+      return { action: "updated" };
+    }
+    const page = await this.notionClient.createPageWithMarkdown({
+      parentId: dbConfig.databaseId,
+      parentType: "database",
+      title,
+      markdown: enhanced,
+      properties: notionProps
+    });
+    this.stateDb.transaction(() => {
+      this.stateDb.upsert({
+        obsidianPath: filePath,
+        notionPageId: page.id,
+        notionParentId: dbConfig.databaseId,
+        contentHash: hash,
+        notionLastEdited: page.last_edited_time,
+        localLastModified: (/* @__PURE__ */ new Date()).toISOString(),
+        syncDirection: "both",
+        fileType: "db-row",
+        status: "synced",
+        baseSnapshot: Buffer.from(content, "utf-8")
+      });
+      this.stateDb.upsertWikilink({
+        obsidianPath: filePath,
+        notionPageId: page.id,
+        title,
+        aliases: extractAliases(frontmatter)
+      });
+    });
+    return { action: "created" };
   }
   /**
    * rename 감지를 위한 고아 레코드 인덱스(내용 해시 → 레코드)를 만든다.
@@ -6962,6 +8209,101 @@ function extractTitleFromPath(filePath) {
   return filename.replace(/\.md$/, "");
 }
 
+// src/audit/completeness.ts
+function groupLocalRowsByDatabase(local) {
+  const byDb = /* @__PURE__ */ new Map();
+  for (const record of local.getAll()) {
+    if (record.fileType !== "db-row") continue;
+    if (!record.notionParentId || !record.notionPageId) continue;
+    const dbKey = compactNotionId(record.notionParentId);
+    let rows = byDb.get(dbKey);
+    if (!rows) {
+      rows = /* @__PURE__ */ new Set();
+      byDb.set(dbKey, rows);
+    }
+    rows.add(compactNotionId(record.notionPageId));
+  }
+  return byDb;
+}
+async function verifyDatabaseCompleteness(remote, local, options) {
+  const localRowsByDb = groupLocalRowsByDatabase(local);
+  const targets = [];
+  const seen = /* @__PURE__ */ new Set();
+  for (const id of options?.databaseIds ?? []) {
+    const key = compactNotionId(id);
+    if (seen.has(key)) continue;
+    seen.add(key);
+    targets.push({ databaseId: id, key });
+  }
+  for (const key of localRowsByDb.keys()) {
+    if (seen.has(key)) continue;
+    seen.add(key);
+    targets.push({ databaseId: key, key });
+  }
+  const databases = [];
+  const failures = [];
+  let remoteTotal = 0;
+  let localTotal = 0;
+  for (const target of targets) {
+    const localIds = localRowsByDb.get(target.key) ?? /* @__PURE__ */ new Set();
+    let remoteIds;
+    try {
+      const pages = await remote.queryAllDatabasePages(target.databaseId);
+      remoteIds = new Set(pages.map((p) => compactNotionId(p.id)));
+    } catch (error) {
+      failures.push({
+        databaseId: target.databaseId,
+        error: error instanceof Error ? error.message : String(error)
+      });
+      continue;
+    }
+    const missingIds = [...remoteIds].filter((id) => !localIds.has(id));
+    const extraIds = [...localIds].filter((id) => !remoteIds.has(id));
+    remoteTotal += remoteIds.size;
+    localTotal += localIds.size;
+    databases.push({
+      databaseId: target.databaseId,
+      remoteRows: remoteIds.size,
+      localRows: localIds.size,
+      missingIds,
+      extraIds
+    });
+  }
+  const complete = failures.length === 0 && databases.every((d) => d.missingIds.length === 0 && d.extraIds.length === 0);
+  return { databases, failures, remoteTotal, localTotal, complete };
+}
+async function verifyPageCompleteness(remote, local, rootPageId) {
+  const localIds = /* @__PURE__ */ new Set();
+  for (const record of local.getAll()) {
+    if (record.fileType === "db-row") continue;
+    if (!record.notionPageId) continue;
+    localIds.add(compactNotionId(record.notionPageId));
+  }
+  let remoteIds;
+  try {
+    const pages = await remote.getPagesUnderRootViaSearch(rootPageId);
+    remoteIds = new Set(pages.map((p) => compactNotionId(p.id)));
+  } catch (error) {
+    return {
+      remotePages: 0,
+      vaultPages: localIds.size,
+      missingIds: [],
+      localOnlyIds: [],
+      error: error instanceof Error ? error.message : String(error),
+      complete: false
+    };
+  }
+  const missingIds = [...remoteIds].filter((id) => !localIds.has(id));
+  const localOnlyIds = [...localIds].filter((id) => !remoteIds.has(id));
+  return {
+    remotePages: remoteIds.size,
+    vaultPages: localIds.size,
+    missingIds,
+    localOnlyIds,
+    complete: missingIds.length === 0
+  };
+}
+
 // src/conflict/merger.ts
 function threeWayMerge(base, local, remote) {
   const baseLines = base.split("\n");
@@ -7206,6 +8548,18 @@ var ConflictResolver = class {
   }
 };
 
+// src/utils/path-scope.ts
+function matchesPathScope(path, scope) {
+  const prefix = scope.endsWith("/") ? scope.slice(0, -1) : scope;
+  if (prefix === "") return true;
+  if (path === prefix) return true;
+  return path.startsWith(`${prefix}/`);
+}
+function inAnyPathScope(path, scopes) {
+  if (!scopes || scopes.length === 0) return true;
+  return scopes.some((s) => matchesPathScope(path, s));
+}
+
 // src/utils/pool.ts
 async function runPool(items, worker, options) {
   const total = items.length;
@@ -7260,6 +8614,59 @@ function resolveFrontmatterRelations(content, idToTitle) {
   return { content: stringifyFrontmatter(parsed.content, resolved), count };
 }
 
+// src/converter/notion-id-links.ts
+var NOTION_ID_WIKILINK_RE = /\[\[notion:([a-f0-9]{32}|[a-f0-9-]{36})(?:\|([^[\]]+))?\]\]/g;
+var compactId = (id) => id.replace(/-/g, "");
+function resolveNotionIdWikilinks(markdown, lookup) {
+  let resolved = 0;
+  const out = markdown.replace(
+    NOTION_ID_WIKILINK_RE,
+    (match, id, rawAlias) => {
+      const path = lookup(id);
+      if (!path) return match;
+      resolved++;
+      const base = wikilinkTitleFromPath(path);
+      const alias = rawAlias === compactId(id) ? void 0 : rawAlias;
+      return formatWikilink(base, alias);
+    }
+  );
+  return { markdown: out, resolved };
+}
+function degradeUnresolvedNotionIdWikilinks(markdown) {
+  let degraded = 0;
+  const out = markdown.replace(
+    NOTION_ID_WIKILINK_RE,
+    (_match, id, alias) => {
+      degraded++;
+      const compact = compactId(id);
+      return `[${alias ?? compact}](https://www.notion.so/${compact})`;
+    }
+  );
+  return { markdown: out, degraded };
+}
+var NOTION_RELATIVE_PAGE_LINK_RE = /\[([^\]]+)\]\(\/(?:p\/)?([a-f0-9]{32})(?:\?[^)#]*)?(?:#([^)]*))?\)/g;
+function resolveNotionRelativePageLinks(markdown, lookup) {
+  let resolved = 0;
+  const out = markdown.replace(NOTION_RELATIVE_PAGE_LINK_RE, (match, label, id) => {
+    const path = lookup(id);
+    if (!path) return match;
+    resolved++;
+    return formatWikilink(wikilinkTitleFromPath(path), label);
+  });
+  return { markdown: out, resolved };
+}
+function degradeUnresolvedNotionRelativePageLinks(markdown) {
+  let degraded = 0;
+  const out = markdown.replace(
+    NOTION_RELATIVE_PAGE_LINK_RE,
+    (_match, label, id, anchor) => {
+      degraded++;
+      return `[${label}](https://www.notion.so/${id}${anchor === void 0 ? "" : `#${anchor}`})`;
+    }
+  );
+  return { markdown: out, degraded };
+}
+
 // src/utils/inline-db-refs.ts
 function extractInlineDbIds(markdown) {
   const ids = /* @__PURE__ */ new Set();
@@ -7363,7 +8770,8 @@ var SyncOrchestrator = class _SyncOrchestrator {
         concurrency: config.advanced.mediaConcurrency,
         maxRetries: config.advanced.mediaMaxRetries,
         retryBaseMs: config.advanced.mediaRetryBaseMs,
-        maxFileSizeBytes: config.advanced.maxFileSizeBytes
+        maxFileSizeBytes: config.advanced.maxFileSizeBytes,
+        downloadTimeoutMs: config.advanced.mediaDownloadTimeoutMs
       },
       stateDb
     );
@@ -7371,7 +8779,12 @@ var SyncOrchestrator = class _SyncOrchestrator {
       vaultFs,
       notionClient,
       stateDb,
-      config.advanced.fileConcurrency
+      config.advanced.fileConcurrency,
+      {
+        fetch: customFetch,
+        downloadTimeoutMs: config.advanced.mediaDownloadTimeoutMs,
+        itemTimeoutMs: config.advanced.itemTimeoutMs
+      }
     );
     this.propertyMapper = new PropertyMapper();
     this.databaseSyncer = new DatabaseSyncer(
@@ -7419,6 +8832,10 @@ var SyncOrchestrator = class _SyncOrchestrator {
   // column 등 컨테이너에 중첩된 자식 페이지를 놓쳐 폴더노트를 file 로 오분류하던 결함
   // (본문이 최상위로 밀려 ' (1).md' 로 분리)을 차단한다. detectRemoteChanges* 진입 시 재구성.
   _childParentIds = /* @__PURE__ */ new Set();
+  // 이번 pull 실행에서 이미 배정된 파일 경로. 워커 풀이 동시에 도는 동안 동명 페이지가
+  // 같은 경로를 골라 서로를 덮어쓰는 것을 막는다({@link resolveUniqueFilePath}).
+  // 실행마다 비운다 — 지난 실행에서 삭제된 경로를 영구히 막지 않기 위해.
+  claimedPaths = /* @__PURE__ */ new Set();
   // 서브트리 직접 순회(getChildPagesRecursive) 시간 예산. 초과하면 search 기반 디스커버리로
   // 폴백한다. 분기점 근거: 워크스페이스 search 열거는 latency-bound 로 대략 이 수준(수천 페이지
   // 워크스페이스에서 ~100s)이므로, 순회가 이 시간을 넘기면 search 가 더 저렴해진다. 작은 볼트는
@@ -7444,7 +8861,7 @@ var SyncOrchestrator = class _SyncOrchestrator {
     );
     const isDbPath = (path) => dbFolders.some((prefix) => path.startsWith(prefix));
     const excludeSet = options?.excludePaths ? new Set(options.excludePaths) : null;
-    const filtered = (options?.paths ? eligible.filter((c) => options.paths.some((p) => c.path.startsWith(p))) : eligible).filter((c) => !isDbPath(c.path) && (!excludeSet || !excludeSet.has(c.path)));
+    const filtered = (options?.paths ? eligible.filter((c) => inAnyPathScope(c.path, options.paths)) : eligible).filter((c) => !isDbPath(c.path) && (!excludeSet || !excludeSet.has(c.path)));
     const hasDbConfigs = (this.config.notion.databases?.length ?? 0) > 0;
     if (filtered.length === 0 && !hasDbConfigs) {
       return { created: 0, updated: 0, deleted: 0, failed: [], duration: Date.now() - startTime };
@@ -7516,7 +8933,11 @@ var SyncOrchestrator = class _SyncOrchestrator {
         if (options?.signal?.aborted) return;
         options?.onProgress?.(++completed, total, { path: change.path, operation: opOf(change) });
         try {
-          await applyPushChange(change);
+          await withDeadline(
+            () => applyPushChange(change),
+            this.config.advanced.itemTimeoutMs,
+            `push ${change.path}`
+          );
         } catch {
           retryQueue.push(change);
         }
@@ -7533,7 +8954,11 @@ var SyncOrchestrator = class _SyncOrchestrator {
         retryQueue,
         async (change) => {
           try {
-            await applyPushChange(change);
+            await withDeadline(
+              () => applyPushChange(change),
+              this.config.advanced.itemTimeoutMs,
+              `push ${change.path}`
+            );
             getLogger().info(`[Im-Nobsidian] \uC7AC\uC2DC\uB3C4 \uC131\uACF5: ${change.path}`);
           } catch (error) {
             failed.push({
@@ -7581,10 +9006,12 @@ var SyncOrchestrator = class _SyncOrchestrator {
   }
   async pull(options) {
     const startTime = Date.now();
+    this.claimedPaths.clear();
     const emptyResult = {
       created: 0,
       updated: 0,
       deleted: 0,
+      restored: 0,
       conflicts: [],
       writtenPaths: [],
       failed: [],
@@ -7597,14 +9024,14 @@ var SyncOrchestrator = class _SyncOrchestrator {
       return emptyResult;
     }
     this.cleanupInterruptedSync();
-    const counts = { created: 0, updated: 0, deleted: 0 };
+    const counts = { created: 0, updated: 0, deleted: 0, restored: 0 };
     this._pullImageCount = 0;
     this._pullFileCount = 0;
     this._inlineDbRefs.clear();
     const conflicts = [];
     const writtenPaths = [];
     const failed = [];
-    const finalize = async (created, updated, deleted) => {
+    const finalize = async (created, updated, deleted, restored = 0) => {
       const linkCount = writtenPaths.length > 0 ? await this.resolveNotionLinks(writtenPaths) : 0;
       this.stateDb.setMeta("last_pull_at", (/* @__PURE__ */ new Date()).toISOString());
       this.stateDb.setMeta("last_sync_at", (/* @__PURE__ */ new Date()).toISOString());
@@ -7613,6 +9040,7 @@ var SyncOrchestrator = class _SyncOrchestrator {
         created,
         updated,
         deleted,
+        restored,
         conflicts,
         writtenPaths,
         failed,
@@ -7628,27 +9056,54 @@ var SyncOrchestrator = class _SyncOrchestrator {
     const remoteChanges = canUseIncremental ? await this.detectRemoteChangesIncremental(lastPull) : await this.detectRemoteChanges();
     const filtered = options?.paths ? remoteChanges.filter((c) => {
       const record = this.stateDb.getByNotionId(c.pageId);
-      return record && options.paths.some((p) => record.obsidianPath.startsWith(p));
+      return !!record && inAnyPathScope(record.obsidianPath, options.paths);
     }) : remoteChanges;
-    if (filtered.length === 0 && (this.config.notion.databases?.length ?? 0) === 0) {
+    const queuedIds = new Set(filtered.map((c) => c.pageId));
+    const restoreChanges = (await this.detectMissingLocalFiles(options?.paths)).filter((r) => r.notionPageId !== null && !queuedIds.has(r.notionPageId)).map((r) => ({
+      pageId: r.notionPageId,
+      type: "modified",
+      lastEdited: r.notionLastEdited ?? r.updatedAt,
+      previousEdited: r.notionLastEdited
+    }));
+    const restoreIds = new Set(restoreChanges.map((c) => c.pageId));
+    const workItems = restoreChanges.length > 0 ? [...filtered, ...restoreChanges] : filtered;
+    if (workItems.length === 0) {
+      let dbCreated = 0;
+      let dbUpdated = 0;
+      let dbRestored = 0;
+      if ((this.config.notion.databases?.length ?? 0) > 0) {
+        try {
+          const dbResult = await this.databaseSyncer.pullAll();
+          dbCreated += dbResult.created;
+          dbUpdated += dbResult.updated;
+          dbRestored += dbResult.restored;
+          conflicts.push(...dbResult.conflicts);
+          failed.push(...dbResult.failed);
+          writtenPaths.push(...dbResult.writtenPaths);
+        } catch (error) {
+          getLogger().warn("[Im-Nobsidian] DB Pull \uC911 \uC624\uB958:", error);
+        }
+      }
       const dbDiscovery = await this.pullDiscoveredDatabases(
         writtenPaths,
         failed,
         conflicts,
         options?.force === true
       );
-      return finalize(dbDiscovery.created, dbDiscovery.updated, 0);
-    }
-    if (filtered.length === 0) {
-      return emptyResult;
+      return finalize(
+        dbCreated + dbDiscovery.created,
+        dbUpdated + dbDiscovery.updated,
+        0,
+        dbRestored + dbDiscovery.restored
+      );
     }
     if (options?.dryRun) {
       const dryCreated = filtered.filter((c) => c.type === "created").length;
       const dryUpdated = filtered.filter((c) => c.type === "modified").length;
       const dryDeleted = filtered.filter((c) => c.type === "deleted").length;
       let dryProgress = 0;
-      const dryTotal = filtered.length;
-      for (const change of filtered) {
+      const dryTotal = workItems.length;
+      for (const change of workItems) {
         const op = change.type === "created" ? "create" : change.type === "deleted" ? "delete" : "update";
         const record = this.stateDb.getByNotionId(change.pageId);
         const displayPath = record?.obsidianPath ?? change.pageId;
@@ -7658,6 +9113,9 @@ var SyncOrchestrator = class _SyncOrchestrator {
         created: dryCreated,
         updated: dryUpdated,
         deleted: dryDeleted,
+        // 복원은 updated 에 섞지 않는다 — dry-run 이 "수정 N건" 이라고만 말하면
+        // 사용자가 사라진 파일이 되살아난다는 사실을 미리 알 수 없다.
+        restored: restoreChanges.length,
         conflicts: [],
         writtenPaths: [],
         failed: [],
@@ -7668,7 +9126,7 @@ var SyncOrchestrator = class _SyncOrchestrator {
       };
     }
     this.stateDb.setMeta("pull_in_progress", "true");
-    const pullTotal = filtered.length;
+    const pullTotal = workItems.length;
     let pullCompleted = 0;
     const toFailure = (change, error) => {
       const record = this.stateDb.getByNotionId(change.pageId);
@@ -7692,7 +9150,8 @@ var SyncOrchestrator = class _SyncOrchestrator {
             conflicts.push(result.conflict);
           } else if (result.path && !result.unchanged) {
             writtenPaths.push(result.path);
-            counts.updated++;
+            if (restoreIds.has(change.pageId)) counts.restored++;
+            else counts.updated++;
           }
           return result.path;
         }
@@ -7711,11 +9170,15 @@ var SyncOrchestrator = class _SyncOrchestrator {
     };
     const retryQueue = [];
     await runPool(
-      filtered,
+      workItems,
       async (change) => {
         if (options?.signal?.aborted) return;
         try {
-          const resultPath = await applyChange(change);
+          const resultPath = await withDeadline(
+            () => applyChange(change),
+            this.config.advanced.itemTimeoutMs,
+            `pull ${this.stateDb.getByNotionId(change.pageId)?.obsidianPath ?? change.pageId}`
+          );
           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";
@@ -7736,7 +9199,11 @@ var SyncOrchestrator = class _SyncOrchestrator {
         retryQueue,
         async (change) => {
           try {
-            await applyChange(change);
+            await withDeadline(
+              () => applyChange(change),
+              this.config.advanced.itemTimeoutMs,
+              `pull ${this.stateDb.getByNotionId(change.pageId)?.obsidianPath ?? change.pageId}`
+            );
             const record = this.stateDb.getByNotionId(change.pageId);
             getLogger().info(
               `[Im-Nobsidian] \uC7AC\uC2DC\uB3C4 \uC131\uACF5: ${record?.obsidianPath ?? change.pageId}`
@@ -7755,6 +9222,7 @@ var SyncOrchestrator = class _SyncOrchestrator {
         const dbResult = await this.databaseSyncer.pullAll();
         counts.created += dbResult.created;
         counts.updated += dbResult.updated;
+        counts.restored += dbResult.restored;
         conflicts.push(...dbResult.conflicts);
         failed.push(...dbResult.failed);
         writtenPaths.push(...dbResult.writtenPaths);
@@ -7771,8 +9239,9 @@ var SyncOrchestrator = class _SyncOrchestrator {
       );
       counts.created += dbDiscovery.created;
       counts.updated += dbDiscovery.updated;
+      counts.restored += dbDiscovery.restored;
     }
-    return finalize(counts.created, counts.updated, counts.deleted);
+    return finalize(counts.created, counts.updated, counts.deleted, counts.restored);
   }
   async sync(options) {
     const startTime = Date.now();
@@ -7826,6 +9295,45 @@ var SyncOrchestrator = class _SyncOrchestrator {
       lastSyncAt
     };
   }
+  /**
+   * 볼트 완결성 검증 — 원격에 있는 것이 볼트에 빠짐없이 있는지 대조한다(R11-B · R12-C).
+   *
+   * 기존 게이트(해시 일치·repull 바이트 동일·churn 0)는 전부 **멱등성**을 본다. 매번
+   * 같은 것을 놓치는 체계적 미발견은 그 게이트를 전부 통과한다 — 실제로 296개 DB 행이
+   * 그렇게 침묵 유실됐다. 여기서만 "빠짐없다"를 본다.
+   *
+   * 대조 대상 database id 는 이 클래스가 조립한다: 설정에 적힌 것 + 디스커버리 캐시가
+   * 아는 것 + DB 모드의 루트 DB. `discovered_dbs` 메타 키를 아는 곳을 이 파일 하나로
+   * 유지해, 호출부(CLI·E2E)가 캐시 표현을 각자 다시 해석하지 않게 한다.
+   *
+   * 페이지(R12-C)는 pull 이 쓴 경로가 아니라 **search 열거**로 대조한다. 페이지는 열거
+   * 경로가 둘이고 둘이 같은 집합을 내지 않는 게 애초의 결함이므로(R12-A), 독립된 두 번째
+   * 열거와 맞대 봐야 의미가 있다.
+   */
+  async verifyCompleteness() {
+    const ids = [];
+    if (this.isDatabaseMode) ids.push(this.config.notion.databaseId);
+    for (const db of this.config.notion.databases ?? []) ids.push(db.databaseId);
+    const cachedRaw = this.stateDb.getMeta("discovered_dbs");
+    if (cachedRaw) {
+      try {
+        const cached = JSON.parse(cachedRaw);
+        for (const entry of cached) {
+          if (entry.databaseId) ids.push(entry.databaseId);
+        }
+      } catch {
+      }
+    }
+    const databases = await verifyDatabaseCompleteness(this.notionClient, this.stateDb, {
+      databaseIds: ids
+    });
+    const pages = this.isDatabaseMode ? null : await verifyPageCompleteness(
+      this.notionClient,
+      this.stateDb,
+      this.config.notion.rootPageId
+    );
+    return { databases, pages, complete: databases.complete && (pages?.complete ?? true) };
+  }
   async fetch() {
     const startTime = Date.now();
     const changes = await this.detectRemoteChanges();
@@ -7837,7 +9345,12 @@ var SyncOrchestrator = class _SyncOrchestrator {
       duration: Date.now() - startTime
     };
   }
-  async buildConflictsFromRecords(records, localChanges, remoteChanges) {
+  /**
+   * @param options.fullRender 원격 본문을 pull 과 동일한 파이프라인으로 렌더할지.
+   *   기본(false)은 화면 미리보기용 경량 렌더 — 첨부를 내려받지 않으므로 `status` 처럼
+   *   읽기만 하는 경로가 쓴다. 볼트에 덮어쓸 본문이 필요한 해소 경로는 반드시 켠다.
+   */
+  async buildConflictsFromRecords(records, localChanges, remoteChanges, options) {
     const conflicts = [];
     for (const record of records) {
       const localChange = localChanges.find((c) => c.path === record.obsidianPath) ?? {
@@ -7846,24 +9359,34 @@ var SyncOrchestrator = class _SyncOrchestrator {
         currentHash: record.contentHash,
         previousHash: record.contentHash
       };
-      const remoteChange = remoteChanges.find((c) => c.pageId === record.notionPageId) ?? {
-        pageId: record.notionPageId ?? "",
-        type: "modified",
-        lastEdited: record.notionLastEdited ?? "",
-        previousEdited: null
-      };
       let localContent = "";
       try {
         localContent = await this.vaultFs.readFile(record.obsidianPath);
       } catch {
       }
       let remoteContent = "";
+      let remoteLastEdited = null;
       if (record.notionPageId) {
         try {
-          remoteContent = (await this.fetchPageMarkdown(record.notionPageId)).content;
+          if (options?.fullRender) {
+            const page = await this.notionClient.getPage(record.notionPageId);
+            remoteLastEdited = page.last_edited_time ?? null;
+            remoteContent = (await this.renderRemotePage(record, record.notionPageId, page)).content;
+          } else {
+            remoteContent = (await this.fetchPageMarkdown(record.notionPageId)).content;
+          }
         } catch {
         }
       }
+      const remoteChange = remoteChanges.find((c) => c.pageId === record.notionPageId) ?? {
+        pageId: record.notionPageId ?? "",
+        type: "modified",
+        // 현재 원격 시각을 실제로 읽어왔다면 그 값을 쓴다. 해소 후 재조정(propagateResolution)
+        // 이 이 값을 그대로 기준점으로 삼는데, 낡은 저장값을 실으면 다음 pull 이 같은 변경을
+        // 다시 충돌로 보고 무한 재충돌한다.
+        lastEdited: remoteLastEdited ?? record.notionLastEdited ?? "",
+        previousEdited: null
+      };
       conflicts.push({
         syncRecord: record,
         localChange,
@@ -7985,9 +9508,10 @@ var SyncOrchestrator = class _SyncOrchestrator {
     }
   }
   async pullDiscoveredDatabases(writtenPaths, failed, conflicts, forceRediscovery = false) {
-    if (this.isDatabaseMode) return { created: 0, updated: 0 };
+    if (this.isDatabaseMode) return { created: 0, updated: 0, restored: 0 };
     let created = 0;
     let updated = 0;
+    let restored = 0;
     try {
       const cachedRaw = this.stateDb.getMeta("discovered_dbs");
       let dbConfigs = [];
@@ -8117,6 +9641,7 @@ var SyncOrchestrator = class _SyncOrchestrator {
             }
             created += dbResult.created;
             updated += dbResult.updated;
+            restored += dbResult.restored;
             conflicts.push(...dbResult.conflicts);
             failed.push(...dbResult.failed);
             writtenPaths.push(...dbResult.writtenPaths);
@@ -8162,7 +9687,7 @@ var SyncOrchestrator = class _SyncOrchestrator {
     } catch (error) {
       getLogger().warn("[Im-Nobsidian] child_database \uC790\uB3D9 \uBC1C\uACAC \uC2E4\uD328:", error);
     }
-    return { created, updated };
+    return { created, updated, restored };
   }
   /**
    * pull 산출 md 의 인라인 DB placeholder(`**제목** *(Notion DB)*` + 보존 마커)를
@@ -8219,51 +9744,55 @@ var SyncOrchestrator = class _SyncOrchestrator {
   }
   async resolveNotionLinks(paths) {
     let totalResolved = 0;
+    let totalDegraded = 0;
     const allRecords = this.stateDb.getAll();
     const idToTitle = /* @__PURE__ */ new Map();
+    const idToPath = /* @__PURE__ */ new Map();
     for (const r of allRecords) {
       if (r.notionPageId && r.obsidianPath) {
         const title = wikilinkTitleFromPath(r.obsidianPath);
         const cleanId = r.notionPageId.replace(/-/g, "");
         idToTitle.set(cleanId, title);
         idToTitle.set(r.notionPageId, title);
+        idToPath.set(cleanId, r.obsidianPath);
       }
     }
     if (idToTitle.size === 0) return 0;
+    const notionIdToPath = (id) => idToPath.get(id.replace(/-/g, "")) ?? null;
     for (const filePath of paths) {
       if (!filePath.endsWith(".md")) continue;
       try {
         let content = await this.vaultFs.readFile(filePath);
         let changed = false;
-        const resolved = content.replace(/\[\[notion:([a-f0-9-]+)\]\]/g, (_match, id) => {
-          const title = idToTitle.get(id.replace(/-/g, ""));
-          if (title) {
-            totalResolved++;
-            changed = true;
-            return `[[${title}]]`;
-          }
-          return _match;
-        });
-        content = resolved;
-        const resolved2 = content.replace(
-          /\[([^\]]+)\]\(\/(?:p\/)?([a-f0-9]{32})(?:\?[^)]*)?\)/g,
-          (_match, text, id) => {
-            const title = idToTitle.get(id);
-            if (title) {
-              totalResolved++;
-              changed = true;
-              return `[[${title}|${text}]]`;
-            }
-            return _match;
-          }
-        );
-        content = resolved2;
+        const idPass = resolveNotionIdWikilinks(content, notionIdToPath);
+        content = idPass.markdown;
+        if (idPass.resolved > 0) {
+          totalResolved += idPass.resolved;
+          changed = true;
+        }
+        const urlPass = resolveNotionRelativePageLinks(content, notionIdToPath);
+        content = urlPass.markdown;
+        if (urlPass.resolved > 0) {
+          totalResolved += urlPass.resolved;
+          changed = true;
+        }
         const fm = resolveFrontmatterRelations(content, idToTitle);
         if (fm.count > 0) {
           content = fm.content;
           totalResolved += fm.count;
           changed = true;
         }
+        for (const degrade of [
+          degradeUnresolvedNotionIdWikilinks,
+          degradeUnresolvedNotionRelativePageLinks
+        ]) {
+          const degradation = degrade(content);
+          if (degradation.degraded > 0) {
+            content = degradation.markdown;
+            totalDegraded += degradation.degraded;
+            changed = true;
+          }
+        }
         if (changed) {
           await this.vaultFs.writeFile(filePath, content);
           const record = this.stateDb.getByPath(filePath);
@@ -8282,6 +9811,11 @@ var SyncOrchestrator = class _SyncOrchestrator {
       } catch {
       }
     }
+    if (totalDegraded > 0) {
+      getLogger().info(
+        `[Im-Nobsidian] \uBCFC\uD2B8 \uBC16 Notion \uD398\uC774\uC9C0 \uB9C1\uD06C ${totalDegraded}\uAC74\uC744 URL \uB9C1\uD06C\uB85C \uC720\uC9C0`
+      );
+    }
     return totalResolved;
   }
   async ensureDbSchema() {
@@ -8323,7 +9857,7 @@ var SyncOrchestrator = class _SyncOrchestrator {
         title
       );
     }
-    const placeholder = this.stateDb.upsert({
+    const placeholder2 = this.stateDb.upsert({
       obsidianPath: path,
       notionPageId: null,
       notionParentId: parentId,
@@ -8337,9 +9871,9 @@ var SyncOrchestrator = class _SyncOrchestrator {
       localMtime: null,
       localFileSize: null
     });
-    const existingOp = this.stateDb.getIncompleteOpByState(placeholder.id, "create");
+    const existingOp = this.stateDb.getIncompleteOpByState(placeholder2.id, "create");
     const walOpId = existingOp?.id ?? this.stateDb.recordPendingOperation({
-      syncStateId: placeholder.id,
+      syncStateId: placeholder2.id,
       operation: "create",
       direction: "push",
       payload: JSON.stringify({ path, parentId, title })
@@ -8365,7 +9899,7 @@ var SyncOrchestrator = class _SyncOrchestrator {
       localMtime: null,
       localFileSize: null
     });
-    await this.imageHandler.uploadAndAppendImages(page.id, conversionResult.images, path);
+    await this.syncEmbeddedMedia(page.id, conversionResult, path);
     const hash = computeHash(content);
     const fileStat = await this.vaultFs.getFileStat(path);
     this.stateDb.transaction(() => {
@@ -8394,6 +9928,27 @@ var SyncOrchestrator = class _SyncOrchestrator {
     });
     this.stateDb.markPendingCompleted(walOpId);
   }
+  /**
+   * 노트에 박힌 로컬 미디어를 Notion 에 올린다(R1).
+   *
+   * 먼저 본문 자리표시자를 실제 image/file 블록으로 **제자리** 교체한다. 그러고도 남은
+   * 이미지만 페이지 끝에 덧붙이는 예전 경로로 흘린다 — 자리표시자가 없는 경우는 본문
+   * push 가 통째로 스킵됐을 때(pageHasLiveChildren) 정도이고, 그때도 이미지 자체는
+   * 올라가야 하므로 폴백을 남긴다.
+   */
+  async syncEmbeddedMedia(pageId, conversionResult, path) {
+    const { handledTargets } = await this.imageHandler.materializeLocalMedia(
+      pageId,
+      conversionResult.content,
+      path
+    );
+    const leftovers = conversionResult.images.filter(
+      (img) => !img.localPath || !handledTargets.has(img.localPath)
+    );
+    if (leftovers.length > 0) {
+      await this.imageHandler.uploadAndAppendImages(pageId, leftovers, path);
+    }
+  }
   async pushUpdate(path) {
     const content = await this.vaultFs.readFile(path);
     const record = this.stateDb.getByPath(path);
@@ -8411,11 +9966,7 @@ var SyncOrchestrator = class _SyncOrchestrator {
       parentMode: this.config.notion.parentMode
     });
     await this.pushUpdatePage(record.notionPageId, conversionResult.content, record.baseSnapshot);
-    await this.imageHandler.uploadAndAppendImages(
-      record.notionPageId,
-      conversionResult.images,
-      path
-    );
+    await this.syncEmbeddedMedia(record.notionPageId, conversionResult, path);
     let propsToUpdate;
     if (this.isDatabaseMode && conversionResult.properties && Object.keys(conversionResult.properties).length > 0) {
       await this.ensureDbSchema();
@@ -8465,6 +10016,67 @@ var SyncOrchestrator = class _SyncOrchestrator {
   // 유실·충돌 루프가 발생한다. 해소 → 전파(propagate)를 오케스트레이터에서 봉합해 무손실
   // 보장. 변환 파이프라인이 필요한 push 는 기존 엔터프라이즈 경로(pushUpdate)를 재사용한다.
   // ──────────────────────────────────────────────────────────────────────────
+  /**
+   * 해소 대상 충돌 목록 — 원격 본문을 pull 과 **같은 파이프라인**으로 렌더해 담는다.
+   *
+   * 해소는 실제로 볼트 파일을 덮어쓰므로 `status()` 의 경량 미리보기 렌더를 쓰면 안 된다
+   * (프론트매터·첨부가 빠진 반쪽 본문이 덮인다). 반대로 전체 pull 을 먼저 돌려 목록을
+   * 얻는 것도 안 된다 — 해소하겠다고 볼트를 먼저 원격으로 덮어쓰는 셈이라 순서가 거꾸로다.
+   * 그래서 충돌 레코드만 좁혀 그 페이지들만 읽어 온다.
+   */
+  async listConflicts() {
+    const records = this.stateDb.getByStatus("conflict");
+    if (records.length === 0) return [];
+    const files = await this.vaultFs.listMarkdownFiles();
+    const localChanges = this.changeDetector.detectLocalChanges(files);
+    return this.buildConflictsFromRecords(records, localChanges, [], { fullRender: true });
+  }
+  /**
+   * 추적 파일의 **현재 원격 본문**을 pull 과 같은 변환으로 렌더한다 — 표시 전용.
+   *
+   * 첨부는 내려받지 않는다: 비교를 보려다 볼트에 파일이 생기면 안 된다. 그 대가로 아직
+   * 내려받지 않은 미디어는 원격 URL 로 남아 비교 화면에만 차이로 보인다.
+   *
+   * @returns 추적되지 않았거나 원격 페이지가 없으면 null.
+   */
+  async renderRemoteSnapshot(path) {
+    const record = this.stateDb.getByPath(path);
+    if (!record?.notionPageId) return null;
+    const page = await this.notionClient.getPage(record.notionPageId);
+    const rendered = await this.renderRemotePage(record, record.notionPageId, page, {
+      downloadMedia: false
+    });
+    return rendered.content;
+  }
+  /**
+   * 해소할 게 남지 않은 충돌 레코드를 `synced` 로 되돌리고, 되돌린 경로를 반환한다.
+   *
+   * 충돌로 표시된 파일은 push 대상에서 통째로 빠진다(양쪽 덮어쓰기 방지). 그래서 사용자가
+   * 손으로 양쪽을 맞춰 둬 이미 같은 내용이 됐는데도 레코드만 남으면, 그 파일의 이후 편집이
+   * **영원히 Notion 에 올라가지 않는다** — 아무 경고 없이 정체된다. 내용이 이미 동일한
+   * 건만 골라 상태를 되돌린다(진짜 충돌은 손대지 않는다).
+   */
+  clearStaleConflicts(conflicts) {
+    const cleared = [];
+    for (const conflict of conflicts) {
+      if (conflict.localContent === "" && conflict.remoteContent === "") continue;
+      if (conflict.localContent !== conflict.remoteContent) continue;
+      const record = conflict.syncRecord;
+      this.stateDb.transaction(() => {
+        this.stateDb.updateHash(
+          record.id,
+          computeHash(conflict.localContent),
+          Buffer.from(conflict.localContent, "utf-8")
+        );
+        this.stateDb.updateStatus(record.id, "synced");
+        if (conflict.remoteChange.lastEdited) {
+          this.stateDb.setNotionLastEdited(record.id, conflict.remoteChange.lastEdited);
+        }
+      });
+      cleared.push(record.obsidianPath);
+    }
+    return cleared;
+  }
   /** 단일 충돌을 사용자가 고른 선택지(local/remote/merge/duplicate)로 해소 + Notion 전파. */
   async resolveConflict(conflict, choice) {
     const result = await this.conflictResolver.resolve(conflict, choice);
@@ -8557,18 +10169,10 @@ var SyncOrchestrator = class _SyncOrchestrator {
     );
     let remotePages;
     if (this.isDatabaseMode) {
-      const allPages = [];
-      let cursor;
-      do {
-        const result = await this.notionClient.queryDatabase(this.config.notion.databaseId, {
-          startCursor: cursor
-        });
-        allPages.push(
-          ...result.results.map((p) => ({ id: p.id, last_edited_time: p.last_edited_time }))
-        );
-        cursor = result.nextCursor ?? void 0;
-      } while (cursor);
-      remotePages = allPages;
+      const allPages = await this.notionClient.queryAllDatabasePages(
+        this.config.notion.databaseId
+      );
+      remotePages = allPages.map((p) => ({ id: p.id, last_edited_time: p.last_edited_time }));
     } else {
       let underRoot;
       try {
@@ -8578,11 +10182,19 @@ var SyncOrchestrator = class _SyncOrchestrator {
       } catch (error) {
         if (!(error instanceof DiscoveryTooLargeError)) throw error;
         getLogger().info(
-          `[Im-Nobsidian] \uC11C\uBE0C\uD2B8\uB9AC\uAC00 \uD07C(${error.message}) \u2192 \uC6CC\uD06C\uC2A4\uD398\uC774\uC2A4 search \uAE30\uBC18 \uB514\uC2A4\uCEE4\uBC84\uB9AC\uB85C \uC804\uD658`
+          `[Im-Nobsidian] \uC11C\uBE0C\uD2B8\uB9AC\uAC00 \uD07C(${error.message}) \u2192 \uC21C\uD68C \uBD80\uBD84 \uACB0\uACFC ${error.partial.length}\uAC74\uC5D0 \uC6CC\uD06C\uC2A4\uD398\uC774\uC2A4 search \uAE30\uBC18 \uB514\uC2A4\uCEE4\uBC84\uB9AC\uB97C \uD569\uCE69\uB2C8\uB2E4`
         );
-        underRoot = await this.notionClient.getPagesUnderRootViaSearch(
+        const viaSearch = await this.notionClient.getPagesUnderRootViaSearch(
           this.config.notion.rootPageId
         );
+        const byId = /* @__PURE__ */ new Map();
+        for (const page of [...error.partial, ...viaSearch]) {
+          byId.set(normalizeNotionId(page.id), page);
+        }
+        underRoot = [...byId.values()];
+        getLogger().info(
+          `[Im-Nobsidian] \uB514\uC2A4\uCEE4\uBC84\uB9AC \uD569\uC9D1\uD569: \uC21C\uD68C ${error.partial.length} \u222A search ${viaSearch.length} \u2192 ${underRoot.length}\uAC74`
+        );
       }
       this._childParentIds.add(normalizeNotionId(this.config.notion.rootPageId));
       for (const page of underRoot) {
@@ -8676,6 +10288,82 @@ var SyncOrchestrator = class _SyncOrchestrator {
     if (notionIdsEqual(parentId, this.config.notion.rootPageId)) return true;
     return !!this.stateDb.getByNotionId(parentId);
   }
+  /**
+   * 추적 중(sync_state)인데 디스크에서 사라진 파일을 찾는다.
+   *
+   * 원격 변경 감지(detectRemoteChanges*)는 "Notion 에서 바뀐 것"만 본다. 로컬에서 파일이
+   * 지워진 경우는 어느 경로로도 잡히지 않아, 재pull 해도 `--force` 로도 되살아나지 않고
+   * 영구히 발산했다. push 는 deleteSync=false 면 원격을 지우지 않으므로 사용자에겐 복구
+   * 수단이 볼트 전체 초기화밖에 남지 않는다 — 이 스캔이 그 마지막 구멍을 막는다.
+   *
+   * 레코드마다 stat 을 던지면 1000건 규모에서 수 초가 든다. 볼트 워크 1회로 실재 목록을
+   * 만든 뒤 차집합을 취한다(md). md 가 아닌 추적 레코드는 수가 적어 개별 확인으로 남긴다.
+   *
+   * 로컬 이름변경·이동은 "사라짐" 과 구별해야 한다 — 되살리면 원본과 새 이름의 사본이
+   * 둘 다 남는다. push 의 detectMoves 와 같은 기준(내용 해시 일치)을 쓰되, 볼트 전체를
+   * 해시하지 않도록 크기가 같은 미추적 파일만 후보로 좁혀 확인한다.
+   */
+  async detectMissingLocalFiles(paths) {
+    if (this.config.sync.deleteSync) return [];
+    const records = this.stateDb.getAll();
+    if (records.length === 0) return [];
+    const scoped = records.filter(
+      (r) => (
+        // folder-only 는 실체가 폴더라 파일 부재가 정상. db-row 를 제외하는 이유는
+        // 여기서 되살리면 행 전용 frontmatter(속성 매핑) 없이 본문만 쓰는 잘못된 경로로
+        // 새기 때문이다 — 복원은 반드시 database-syncer 의 행 경로가 해야 한다.
+        // 다만 그쪽이 실제로 복원하는지는 오래 참이 아니었다: 원격 무변경이면 로컬 존재를
+        // 묻지도 않고 건너뛰어, 지운 행이 어느 경로로도 돌아오지 않았다. R13 에서 그
+        // 존재 확인을 넣어 이 제외가 비로소 근거를 갖는다(tests/sync/db-row-restore-deleted).
+        (r.fileType === "file" || r.fileType === "folder-note") && r.notionPageId !== null && inAnyPathScope(r.obsidianPath, paths)
+      )
+    );
+    if (scoped.length === 0) return [];
+    const stats = await this.vaultFs.listMarkdownFileStats();
+    const live = new Set(stats.map((f) => f.path));
+    const candidates = [];
+    for (const record of scoped) {
+      if (record.obsidianPath.endsWith(".md")) {
+        if (!live.has(record.obsidianPath)) candidates.push(record);
+      } else if (!await this.vaultFs.exists(record.obsidianPath)) {
+        candidates.push(record);
+      }
+    }
+    if (candidates.length === 0) return [];
+    const tracked = new Set(records.map((r) => r.obsidianPath));
+    const untrackedBySize = /* @__PURE__ */ new Map();
+    for (const f of stats) {
+      if (tracked.has(f.path)) continue;
+      const bucket = untrackedBySize.get(f.size);
+      if (bucket) bucket.push(f.path);
+      else untrackedBySize.set(f.size, [f.path]);
+    }
+    const hashCache = /* @__PURE__ */ new Map();
+    const hashOf = async (path) => {
+      const cached = hashCache.get(path);
+      if (cached !== void 0) return cached;
+      let hash = null;
+      try {
+        hash = computeHash(await this.vaultFs.readFile(path));
+      } catch {
+      }
+      hashCache.set(path, hash);
+      return hash;
+    };
+    const missing = [];
+    for (const record of candidates) {
+      const sameSize = record.localFileSize !== null ? untrackedBySize.get(record.localFileSize) ?? [] : [...untrackedBySize.values()].flat();
+      let renamed = false;
+      for (const path of sameSize) {
+        if (await hashOf(path) === record.contentHash) {
+          renamed = true;
+          break;
+        }
+      }
+      if (!renamed) missing.push(record);
+    }
+    return missing;
+  }
   async pullCreate(pageId) {
     const page = await this.notionClient.getPage(pageId);
     const title = this.notionClient.extractTitle(page);
@@ -8688,17 +10376,16 @@ var SyncOrchestrator = class _SyncOrchestrator {
     let fileType;
     if (hasChildPages && hasContent) {
       const folderPath = parentPath ? `${parentPath}/${safeName}` : safeName;
-      filePath = await this.resolveUniqueFilePath(`${folderPath}/${safeName}.md`);
+      filePath = await this.resolveUniqueFilePath(folderPath, safeName, pageId);
       fileType = "folder-note";
       await this.vaultFs.ensureFolder(folderPath);
     } else if (hasChildPages && !hasContent) {
       const folderPath = parentPath ? `${parentPath}/${safeName}` : safeName;
-      filePath = await this.resolveUniqueFilePath(`${folderPath}/${safeName}.md`);
+      filePath = await this.resolveUniqueFilePath(folderPath, safeName, pageId);
       fileType = "folder-only";
       await this.vaultFs.ensureFolder(folderPath);
     } else {
-      const basePath = parentPath ? `${parentPath}/${safeName}.md` : `${safeName}.md`;
-      filePath = await this.resolveUniqueFilePath(basePath);
+      filePath = await this.resolveUniqueFilePath(parentPath, safeName, pageId);
       fileType = "file";
     }
     let properties;
@@ -8715,11 +10402,16 @@ var SyncOrchestrator = class _SyncOrchestrator {
     }
     let processedMarkdown = markdown;
     if (this.config.conversion.imageDownload === "immediate") {
-      const imageResult = await this.imageHandler.downloadAllImages(markdown, title, pageId);
+      const imageResult = await this.imageHandler.downloadAllImages(
+        markdown,
+        title,
+        pageId,
+        filePath
+      );
       processedMarkdown = imageResult.content;
       this._pullImageCount += imageResult.downloads.length;
     }
-    const fileResult = await this.imageHandler.downloadAllFiles(processedMarkdown, title);
+    const fileResult = await this.imageHandler.downloadAllFiles(processedMarkdown, title, filePath);
     processedMarkdown = fileResult.content;
     this._pullFileCount += fileResult.downloads.length;
     const finalContent = this.pipeline.convertToMarkdown(
@@ -8783,11 +10475,20 @@ var SyncOrchestrator = class _SyncOrchestrator {
       return false;
     }
   }
-  async pullUpdate(change) {
-    const record = this.stateDb.getByNotionId(change.pageId);
-    if (!record) return {};
-    const page = await this.notionClient.getPage(change.pageId);
-    const fetched = await this.fetchPageMarkdown(change.pageId);
+  /**
+   * 원격 페이지를 **pull 과 동일한 파이프라인**으로 볼트에 쓸 수 있는 본문까지 렌더한다.
+   * (본문 변환 → 이미지/첨부 내려받기 → 속성 주입 → preserve marker → 압축형 간격 판정)
+   *
+   * pull 경로와 충돌 해소 경로가 이 한 곳을 공유해야 한다. 예전엔 충돌 목록만
+   * {@link fetchPageMarkdown} 원문을 그대로 담아, `nobsi resolve` 에서 "원격 유지"를 고르면
+   * 프론트매터도 첨부도 없는 반쪽 본문이 볼트에 덮여 썼다 — 해소가 곧 손실이었다.
+   *
+   * @returns 렌더된 본문과 함께, 호출자가 위키링크 레지스트리 등에 쓰는 제목·속성.
+   *          여기서 이미 읽은 값을 되돌려 줘야 호출자가 같은 페이지를 다시 파싱하지 않는다.
+   */
+  async renderRemotePage(record, pageId, page, options) {
+    const downloadMedia = options?.downloadMedia !== false;
+    const fetched = await this.fetchPageMarkdown(pageId);
     let markdown = fetched.content;
     const title = this.notionClient.extractTitle(page);
     let properties;
@@ -8802,16 +10503,27 @@ var SyncOrchestrator = class _SyncOrchestrator {
     if (this.isDatabaseMode || extractTitle(record.obsidianPath) !== title) {
       properties.title = title;
     }
-    if (this.config.conversion.imageDownload === "immediate") {
-      const imageResult = await this.imageHandler.downloadAllImages(markdown, title, change.pageId);
+    if (downloadMedia && this.config.conversion.imageDownload === "immediate") {
+      const imageResult = await this.imageHandler.downloadAllImages(
+        markdown,
+        title,
+        pageId,
+        record.obsidianPath
+      );
       markdown = imageResult.content;
       this._pullImageCount += imageResult.downloads.length;
     }
-    const fileResult = await this.imageHandler.downloadAllFiles(markdown, title);
-    markdown = fileResult.content;
-    this._pullFileCount += fileResult.downloads.length;
+    if (downloadMedia) {
+      const fileResult = await this.imageHandler.downloadAllFiles(
+        markdown,
+        title,
+        record.obsidianPath
+      );
+      markdown = fileResult.content;
+      this._pullFileCount += fileResult.downloads.length;
+    }
     const savedMarkers = this.stateDb.getPreserveMarkers(record.obsidianPath);
-    const remoteContent = this.pipeline.convertToMarkdown(
+    const content = this.pipeline.convertToMarkdown(
       markdown,
       {
         direction: "pull",
@@ -8825,15 +10537,30 @@ var SyncOrchestrator = class _SyncOrchestrator {
         notionExportCompact: fetched.compact
       }
     );
+    return { content, title, properties };
+  }
+  async pullUpdate(change) {
+    const record = this.stateDb.getByNotionId(change.pageId);
+    if (!record) return {};
+    const page = await this.notionClient.getPage(change.pageId);
+    const remoteGone = page.in_trash === true || page.archived === true;
+    if (remoteGone && !await this.vaultFs.exists(record.obsidianPath)) {
+      return { unchanged: true };
+    }
+    const rendered = await this.renderRemotePage(record, change.pageId, page);
+    const remoteContent = rendered.content;
     let localContent;
+    let localExists = true;
     try {
       localContent = await this.vaultFs.readFile(record.obsidianPath);
     } catch {
       localContent = "";
+      localExists = await this.vaultFs.exists(record.obsidianPath);
     }
     const resolution = resolvePullConflict({
       record,
       localContent,
+      localExists,
       remoteContent,
       remoteChange: change,
       strategy: this.config.sync.conflictStrategy
@@ -8845,7 +10572,7 @@ var SyncOrchestrator = class _SyncOrchestrator {
       this.stateDb.updateStatus(record.id, "conflict");
       return { conflict: resolution.conflict };
     }
-    if (remoteContent === localContent) {
+    if (localExists && remoteContent === localContent) {
       const stat2 = await this.vaultFs.getFileStat(record.obsidianPath);
       this.stateDb.upsert({
         obsidianPath: record.obsidianPath,
@@ -8881,11 +10608,11 @@ var SyncOrchestrator = class _SyncOrchestrator {
         localMtime: updateStat?.mtime ?? null,
         localFileSize: updateStat?.size ?? null
       });
-      const aliases = extractAliases2(properties);
+      const aliases = extractAliases2(rendered.properties);
       this.stateDb.upsertWikilink({
         obsidianPath: record.obsidianPath,
         notionPageId: change.pageId,
-        title,
+        title: rendered.title,
         aliases
       });
     });
@@ -9134,13 +10861,10 @@ var SyncOrchestrator = class _SyncOrchestrator {
   // 이를 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}]]`;
-    });
+    return resolveNotionIdWikilinks(
+      markdown,
+      (id) => this.stateDb.getByNotionId(normalizeNotionId(id))?.obsidianPath ?? null
+    ).markdown;
   }
   async extractParentId(page) {
     const parent = page.parent;
@@ -9272,16 +10996,45 @@ var SyncOrchestrator = class _SyncOrchestrator {
     }
     return null;
   }
-  async resolveUniqueFilePath(basePath) {
-    if (!await this.vaultFs.exists(basePath)) return basePath;
-    const dir = basePath.lastIndexOf("/") >= 0 ? basePath.slice(0, basePath.lastIndexOf("/")) : "";
-    const ext = ".md";
-    const name = basePath.slice(dir ? dir.length + 1 : 0, -ext.length);
-    for (let i = 1; i <= 99; i++) {
-      const candidate = dir ? `${dir}/${name} (${i})${ext}` : `${name} (${i})${ext}`;
-      if (!await this.vaultFs.exists(candidate)) return candidate;
+  /**
+   * 신규 pull 페이지가 쓸 파일 경로를 충돌 없이 결정하고 **그 자리에서 선점**한다.
+   *
+   * DB 행과 **같은 규칙**({@link pagePathCandidates})을 쓴다. 예전에는 `(1)`, `(2)` …
+   * 순번을 99 까지 훑고 고갈되면 **원본 경로를 그대로 돌려줬는데**, 그러면 남의 노트를
+   * 조용히 덮어써 내용이 사라진다. 순번은 그때의 볼트 상태로 정해져 실행마다 페이지끼리
+   * 접미사가 뒤바뀔 수도 있었다(pull 마다 파일이 갈아엎히는 churn).
+   *
+   * 점유 판정은 세 가지를 모두 본다:
+   *   · 이번 실행의 선점 장부 — 아래 참조.
+   *   · 추적 레코드 — 다른 페이지가 소유한 경로면 피하고, 자기 소유면 그대로 재사용한다.
+   *   · 볼트 파일 — 추적되지 않는 사용자 노트가 놓여 있으면 피한다.
+   *
+   * 선점 장부가 필요한 이유는 pull 이 워커 풀로 **동시 실행**되기 때문이다. 조회와 기록
+   * 사이에 await 가 끼면 동명 페이지 여럿이 나란히 "비어 있음"을 보고 같은 경로를 고른다.
+   * 그러면 마지막에 쓴 페이지만 남고 나머지 본문이 사라진다(실측 재현: 동명 3페이지 →
+   * 파일 1개·레코드 1건). 그래서 마지막 확인과 등록을 **await 없는 동기 구간**에 묶는다 —
+   * 그 사이에는 다른 작업이 끼어들 수 없으므로 두 페이지가 같은 경로를 얻는 일이 없다.
+   */
+  async resolveUniqueFilePath(dir, safeName, pageId) {
+    const candidates = pagePathCandidates(dir, safeName, pageId);
+    for (const candidate of candidates) {
+      if (this.claimedPaths.has(candidate)) continue;
+      const owner = this.stateDb.getByPath(candidate);
+      if (owner) {
+        if (owner.notionPageId != null && notionIdsEqual(owner.notionPageId, pageId)) {
+          this.claimedPaths.add(candidate);
+          return candidate;
+        }
+        continue;
+      }
+      if (await this.vaultFs.exists(candidate)) continue;
+      if (this.claimedPaths.has(candidate)) continue;
+      this.claimedPaths.add(candidate);
+      return candidate;
     }
-    return basePath;
+    const fallback = candidates[candidates.length - 1];
+    this.claimedPaths.add(fallback);
+    return fallback;
   }
 };
 function extractTitle(filePath) {
@@ -10205,6 +11958,63 @@ function summarizeFidelity(perFile) {
   return summary;
 }
 
-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, IGNORE_FILE, INTERNAL_DIR, INTERNAL_DIR_GLOB, ImageHandler, InlineAnnotationPreserver, InlineDBParser, LocalImageRestorer, MARKER_BRAND, MathNormalizer, MentionToWikilink, NOTION_TO_BASES_VIEW, NodeVaultFS, NotionBlockBuilder, NotionClient, PreserveMarkerCollector, PreserveMarkerInjector, PropertiesTableInjector, PropertiesTableRestorer, PropertyMapper, STATE_DB_FILE, STATE_DB_PATH, SidecarGenerator, StateDB, SyncOrchestrator, TreeMapper, UnsupportedBlockStripper, ViewDataProvider, WatchSyncService, WikilinkResolver, basesViewTypeOf, classifyBodyFidelity, compactNotionId, computeBufferHash, computeHash, createDefaultPipeline, extractCalendarEntries, filterByMonth, filterEntries, generateColorCSS, generateId, getLogger, getNotionBgColor, getNotionColor, getVisibleProperties, groupEntries, isInternalPath, normalizeNotionId, notionIdsEqual, sanitizeFileName, setLogger, sortEntries, summarizeFidelity, threeWayMerge };
+// src/audit/render.ts
+var RENDER_LINE_RULES = [
+  {
+    code: "\u2460",
+    label: "\uCF5C\uC544\uC6C3 4\uCE78+ \uB4E4\uC5EC\uC4F0\uAE30",
+    // Obsidian 은 절대 들여쓰기 4칸부터 들여쓰기 코드블록으로 오파싱한다.
+    // 콜아웃이 통째로 회색 코드 상자가 되어 서식이 전부 죽는다.
+    re: /^(?: {4,}|\t)+>\s*\[!/
+  },
+  {
+    code: "\u2461",
+    label: "\uD1A0\uAE00\uD5E4\uB529 \uC18D\uC131 \uB204\uC218",
+    // NFM 전용 속성이 본문에 그대로 노출된 상태 — 토글도 접히지 않는다.
+    re: /\{toggle="true"\}/
+  },
+  {
+    code: "\u2462",
+    label: "NFM \uCEE8\uD14C\uC774\uB108 \uD0DC\uADF8 \uB204\uC218",
+    re: /<\/?(?:details|summary|callout|columns|column)\b/
+  },
+  {
+    code: "\u2463",
+    label: "NFM \uC804\uC6A9 \uD0DC\uADF8 \uB204\uC218",
+    // 이름이 붙어 `<unknown>` 폴백에 걸리지 않던 태그들.
+    re: /<(?:table_of_contents|embed|unknown_mention|empty-block)\b/
+  },
+  {
+    code: "\u2464",
+    label: "\uCF54\uB4DC\uD39C\uC2A4 4\uCE78 \uB4E4\uC5EC\uC4F0\uAE30(\uCF5C\uC544\uC6C3 \uBC16)",
+    re: /^ {4,}```/
+  }
+];
+var SEPARATOR_BODY = "[ \\t:|-]*-{3,}";
+var SEPARATOR_RE = new RegExp(`^[\\t ]*>?[\\t ]*\\|${SEPARATOR_BODY}[ \\t:|-]*\\|`);
+var FENCE_RE2 = /^[\t ]*(?:>[\t ]*)*```/;
+function lintRenderedMarkdown(markdown) {
+  const lines = markdown.split("\n");
+  const findings = [];
+  for (let i = 0; i < lines.length; i++) {
+    const line = lines[i];
+    for (const rule of RENDER_LINE_RULES) {
+      if (rule.re.test(line)) findings.push({ code: rule.code, label: rule.label, line: i + 1 });
+    }
+    if (SEPARATOR_RE.test(line)) {
+      const prefix = /^([\t ]*>?[\t ]*)/.exec(line)[1];
+      const prev = lines[i - 1] ?? "";
+      if (!prev.startsWith(prefix) || !prev.slice(prefix.length).trimStart().startsWith("|")) {
+        findings.push({ code: "\u2466", label: "\uD45C \uAD6C\uBD84\uD589 \uACE0\uC544(\uD45C \uC0AC\uB9DD)", line: i + 1 });
+      }
+    }
+  }
+  if (lines.filter((l) => FENCE_RE2.test(l)).length % 2 !== 0) {
+    findings.push({ code: "\u2467", label: "\uCF54\uB4DC\uD39C\uC2A4 \uD640\uC218(\uBB38\uC11C \uC794\uC5EC\uBD84 \uC0BC\uD0B4)", line: 0 });
+  }
+  return findings;
+}
+
+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, IGNORE_FILE, INTERNAL_DIR, INTERNAL_DIR_GLOB, ImageHandler, InlineAnnotationPreserver, InlineDBParser, LocalImageRestorer, MARKER_BRAND, MathNormalizer, MentionToWikilink, NOTION_TO_BASES_VIEW, NodeVaultFS, NotionBlockBuilder, NotionClient, PreserveMarkerCollector, PreserveMarkerInjector, PropertiesTableInjector, PropertiesTableRestorer, PropertyMapper, RENDER_LINE_RULES, SEPARATOR_BODY, STATE_DB_FILE, STATE_DB_PATH, SidecarGenerator, StateDB, SyncOrchestrator, TreeMapper, UnsupportedBlockStripper, ViewDataProvider, WatchSyncService, WikilinkResolver, basesViewMappingOf, basesViewTypeOf, classifyBodyFidelity, compactNotionId, computeBufferHash, computeHash, createDefaultPipeline, extractCalendarEntries, filterByMonth, filterEntries, generateColorCSS, generateId, getLogger, getNotionBgColor, getNotionColor, getVisibleProperties, groupEntries, inAnyPathScope, isInternalPath, lintRenderedMarkdown, matchesPathScope, normalizeNotionId, notionIdsEqual, resolvePropertyName, sanitizeFileName, setLogger, sortEntries, summarizeFidelity, threeWayMerge, translateNotionFilter, verifyDatabaseCompleteness, verifyPageCompleteness };
 //# sourceMappingURL=index.js.map
 //# sourceMappingURL=index.js.map