@im-nobsidian/core 0.2.0 → 0.3.0

package/dist/index.js

@@ -2312,6 +2312,50 @@ var FrontmatterExtractor = class {
   }
 };
 
+// src/utils/md-regions.ts
+function computeAnchor(content, idx) {
+  const before = content.slice(Math.max(0, idx - 32), idx);
+  const sameLine = before.split("\n").pop() ?? "";
+  if (sameLine.trim().length >= 4) return sameLine;
+  const prevLines = content.slice(0, idx).split("\n");
+  for (let i = prevLines.length - 2; i >= 0; i--) {
+    const line = prevLines[i].trim();
+    if (line.length > 0) return line.slice(0, 48);
+  }
+  return "";
+}
+function mapOutsideCodeFences(content, fn) {
+  const lines = content.split("\n");
+  const out = [];
+  let buffer = [];
+  let fence = null;
+  const flush = () => {
+    if (buffer.length > 0) {
+      out.push(fn(buffer.join("\n")));
+      buffer = [];
+    }
+  };
+  for (const line of lines) {
+    const fenceMatch = line.match(/^\s*(```+|~~~+)/);
+    if (fence === null && fenceMatch) {
+      flush();
+      fence = fenceMatch[1][0].repeat(3);
+      out.push(line);
+      continue;
+    }
+    if (fence !== null) {
+      out.push(line);
+      if (fenceMatch && fenceMatch[1].startsWith(fence)) {
+        fence = null;
+      }
+      continue;
+    }
+    buffer.push(line);
+  }
+  flush();
+  return out.join("\n");
+}
+
 // src/converter/pre-processors/wikilink.ts
 var WIKILINK_REGEX2 = /(?<!!)\[\[([^\]|]+)(?:\|([^\]]+))?\]\]/g;
 var WikilinkResolver = class {
@@ -2328,7 +2372,7 @@ var WikilinkResolver = class {
     const preserveMarkers = input.metadata.preserveMarkers ? [...input.metadata.preserveMarkers] : [];
     const resolved = input.content.replace(
       WIKILINK_REGEX2,
-      (_match, target, display) => {
+      (_match, target, display, offset) => {
         const label = display ?? target;
         if (this.resolve) {
           const entry = this.resolve(target);
@@ -2336,10 +2380,12 @@ var WikilinkResolver = class {
             return `<mention-page id="${entry.notionPageId}">${label}</mention-page>`;
           }
         }
+        const params = display ? { text: target, display } : { text: target };
+        params.__anchor = computeAnchor(input.content, offset);
         preserveMarkers.push({
           type: "wikilink",
-          params: display ? { text: target, display } : { text: target },
-          startIndex: 0
+          params,
+          startIndex: offset
         });
         const encodedTarget = encodeURIComponent(target);
         return `[${label}](${WIKILINK_PROTOCOL}${encodedTarget})`;
@@ -2444,6 +2490,11 @@ var EmbedResolver = class {
         }
         return `![${target}](${encodeURI(target)})`;
       }
+      if (isPush && !isExternalUrl(target) && isAttachmentFile(target)) {
+        const fileName = target.split("/").pop() ?? target;
+        return `> \u{1F4CE} ${fileName}
+> ${spacedMarker(`local-file:${target}`)}`;
+      }
       const encoded = encodeURIComponent(target);
       return `[${target}](${EMBED_PROTOCOL}${encoded})`;
     });
@@ -2466,6 +2517,11 @@ var EmbedResolver = class {
 function isImageFile(path) {
   return /\.(png|jpg|jpeg|gif|svg|webp|bmp|ico)$/i.test(path);
 }
+function isAttachmentFile(target) {
+  const path = target.split("|")[0];
+  const ext = /\.([a-z0-9]+)$/i.exec(path)?.[1]?.toLowerCase();
+  return ext !== void 0 && ext !== "md" && ext !== "canvas";
+}
 function isVideoUrl(url) {
   return VIDEO_HOSTS.some((host) => url.includes(host));
 }
@@ -2484,7 +2540,7 @@ var PreserveMarkerCollector = class {
     for (const match of matches) {
       markers.push({
         type: match[1],
-        params: parseMarkerParams(match[2]),
+        params: parseMarkerParams(match[2], input.content, match.index),
         startIndex: match.index
       });
     }
@@ -2494,14 +2550,19 @@ var PreserveMarkerCollector = class {
     };
   }
 };
-function parseMarkerParams(paramString) {
+function parseMarkerParams(paramString, content, index) {
   const params = {};
-  for (const pair of paramString.split("&")) {
-    const eqIdx = pair.indexOf("=");
-    if (eqIdx > 0) {
-      params[pair.slice(0, eqIdx)] = decodeURIComponent(pair.slice(eqIdx + 1));
+  if (paramString.includes("=")) {
+    for (const pair of paramString.split("&")) {
+      const eqIdx = pair.indexOf("=");
+      if (eqIdx > 0) {
+        params[pair.slice(0, eqIdx)] = decodeURIComponent(pair.slice(eqIdx + 1));
+      }
     }
+  } else {
+    params.__raw = paramString;
   }
+  params.__anchor = computeAnchor(content, index);
   return params;
 }
 
@@ -2522,7 +2583,20 @@ var UnsupportedBlockStripper = class {
   }
 };
 function stringifyFrontmatter(content, data) {
-  return matter.stringify({ content }, data);
+  const out = matter.stringify(
+    { content },
+    data
+  );
+  return unquoteFrontmatterDates(out);
+}
+var QUOTED_DATE_LINE_RE = /^([ \t]*[^:\n]+:[ \t]*)'(\d{4}-\d{2}-\d{2})'([ \t]*)$/gm;
+function unquoteFrontmatterDates(out) {
+  if (!out.startsWith("---\n")) return out;
+  const close = out.indexOf("\n---\n", 3);
+  if (close === -1) return out;
+  const fmEnd = close + "\n---\n".length;
+  const fm = out.slice(0, fmEnd).replace(QUOTED_DATE_LINE_RE, "$1$2$3");
+  return fm + out.slice(fmEnd);
 }
 
 // src/converter/pre-processors/properties-table.ts
@@ -2557,6 +2631,7 @@ var PropertiesTableInjector = class {
 
 // src/converter/pre-processors/html-annotation.ts
 var UNDERLINE_REGEX = /<u>([\s\S]*?)<\/u>/g;
+var HIGHLIGHT_REGEX = /(?<!=)==([^=\n]+?)==(?!=)/g;
 var COLOR_SPAN_REGEX = /<span class="notion-(\w+)(-bg)?">([\s\S]*?)<\/span>/g;
 var SPACED_COLOR_REGEX = new RegExp(
   `%% ${MARKER_BRAND_RE}:color:(\\w+(?:_background)?) %%([\\s\\S]*?)%% ${MARKER_BRAND_RE}:end %%`,
@@ -2585,10 +2660,136 @@ var InlineAnnotationPreserver = class {
         return `${compactMarker(`color:${color}`)}${text}%%/color%%`;
       }
     );
+    content = mapOutsideCodeFences(
+      content,
+      (segment) => segment.replace(
+        HIGHLIGHT_REGEX,
+        (_m, text) => `${compactMarker("color:yellow_bg")}${text}%%/color%%`
+      )
+    );
+    return { content, metadata: input.metadata };
+  }
+};
+
+// src/converter/pre-processors/comment-stripper.ts
+var COMMENT_REGEX = /%%([\s\S]*?)%%/g;
+var CommentStripper = class {
+  name = "CommentStripper";
+  // FrontmatterExtractor(10) 뒤 — YAML 값 속 `%%` 를 본문 주석으로 오인하지 않는다.
+  order = 11;
+  process(input) {
+    if (input.context.direction !== "push") {
+      return { content: input.content, metadata: input.metadata };
+    }
+    const markers = input.metadata.preserveMarkers ? [...input.metadata.preserveMarkers] : [];
+    const content = mapOutsideCodeFences(
+      input.content,
+      (segment) => segment.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
+        });
+        return "";
+      })
+    );
+    return {
+      content,
+      metadata: { ...input.metadata, preserveMarkers: markers }
+    };
+  }
+};
+
+// src/converter/pre-processors/footnote-guard.ts
+var FOOTNOTE_TOKEN_REGEX = /(?<!\\)\[\^([^\]\s]+)\]/g;
+var FootnoteGuard = class {
+  name = "FootnoteGuard";
+  order = 12;
+  process(input) {
+    if (input.context.direction !== "push") {
+      return { content: input.content, metadata: input.metadata };
+    }
+    const content = mapOutsideCodeFences(
+      input.content,
+      (segment) => segment.replace(FOOTNOTE_TOKEN_REGEX, "\\[^$1]")
+    );
     return { content, metadata: input.metadata };
   }
 };
 
+// src/converter/pre-processors/table-alignment.ts
+var DELIMITER_CELL_RE = /^:?-{1,}:?$/;
+function parseDelimiterRow(line) {
+  const trimmed = line.trim();
+  if (!trimmed.includes("-") || !trimmed.includes("|")) return null;
+  const inner = trimmed.replace(/^\|/, "").replace(/\|$/, "");
+  const cells = inner.split("|").map((c) => c.trim());
+  if (cells.length === 0) return null;
+  return cells.every((c) => DELIMITER_CELL_RE.test(c)) ? cells : null;
+}
+function cellAlignment(cell) {
+  const l = cell.startsWith(":");
+  const r = cell.endsWith(":");
+  if (l && r) return "center";
+  if (r) return "right";
+  if (l) return "left";
+  return "none";
+}
+function alignmentsToDelimiter(alignments) {
+  const cells = alignments.map((a) => {
+    switch (a) {
+      case "center":
+        return ":---:";
+      case "right":
+        return "---:";
+      case "left":
+        return ":---";
+      default:
+        return "---";
+    }
+  });
+  return `| ${cells.join(" | ")} |`;
+}
+var TableAlignmentGuard = class {
+  name = "TableAlignmentGuard";
+  order = 45;
+  process(input) {
+    if (input.context.direction !== "push") {
+      return { content: input.content, metadata: input.metadata };
+    }
+    const markers = input.metadata.preserveMarkers ? [...input.metadata.preserveMarkers] : [];
+    const lines = input.content.split("\n");
+    let changed = false;
+    for (let i = 1; i < lines.length; i++) {
+      const cells = parseDelimiterRow(lines[i]);
+      if (!cells || !lines[i].includes(":")) continue;
+      const prev = lines[i - 1];
+      if (!prev.includes("|")) continue;
+      markers.push({
+        type: "table-align",
+        params: {
+          align: cells.map(cellAlignment).join(","),
+          __anchor: prev.trim().slice(0, 64),
+          // 원본 구분행 원문. 복원 시 정렬뿐 아니라 셀 폭 패딩까지 그대로 되살려
+          // 라운드트립 delta-0 을 만족시킨다(__ 접두라 마커 렌더링에서 제외).
+          __line: lines[i]
+        },
+        startIndex: 0
+      });
+      lines[i] = alignmentsToDelimiter(cells.map(() => "none"));
+      changed = true;
+    }
+    return {
+      content: changed ? lines.join("\n") : input.content,
+      metadata: { ...input.metadata, preserveMarkers: markers }
+    };
+  }
+};
+
 // 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");
@@ -2620,6 +2821,91 @@ var MentionToWikilink = class {
   }
 };
 
+// src/converter/post-processors/escape-normalizer.ts
+var EscapeNormalizer = class {
+  name = "EscapeNormalizer";
+  order = 3;
+  process(input) {
+    if (input.context.direction !== "pull") {
+      return { content: input.content, metadata: input.metadata };
+    }
+    const content = mapOutsideCodeFences(
+      input.content,
+      (segment) => segment.replace(/\\\[\^([^\]\\\n]+)\\\]/g, "[^$1]").replace(/\\\[\^/g, "[^").replace(/\\:/g, ":")
+    );
+    return { content, metadata: input.metadata };
+  }
+};
+
+// src/converter/post-processors/highlight-restorer.ts
+var COMPACT_YELLOW_RE = new RegExp(
+  `%%${MARKER_BRAND_RE}:color:yellow(?:_background|_bg)%%([^\\n]*?)%%\\/color%%`,
+  "g"
+);
+var SPACED_YELLOW_RE = new RegExp(
+  `%% ${MARKER_BRAND_RE}:color:yellow(?:_background|_bg) %%([^\\n]*?)%% ${MARKER_BRAND_RE}:end %%`,
+  "g"
+);
+var HighlightRestorer = class {
+  name = "HighlightRestorer";
+  order = 25;
+  process(input) {
+    if (input.context.direction !== "pull") {
+      return { content: input.content, metadata: input.metadata };
+    }
+    const content = input.content.replace(COMPACT_YELLOW_RE, (_m, text) => text ? `==${text}==` : "").replace(SPACED_YELLOW_RE, (_m, text) => text ? `==${text}==` : "");
+    return { content, metadata: input.metadata };
+  }
+};
+
+// src/converter/post-processors/table-alignment-restorer.ts
+var TableAlignmentRestorer = class {
+  name = "TableAlignmentRestorer";
+  order = 35;
+  process(input) {
+    if (input.context.direction !== "pull") {
+      return { content: input.content, metadata: input.metadata };
+    }
+    const lines = input.content.split("\n");
+    for (let i = 1; i < lines.length - 1; i++) {
+      const delim = parseDelimiterRow(lines[i]);
+      if (!delim || lines[i].includes(":")) continue;
+      const phantom = parseDelimiterRow(lines[i + 1]);
+      if (!phantom || !lines[i + 1].includes(":") || phantom.length !== delim.length) continue;
+      if (!lines[i - 1].includes("|")) continue;
+      lines[i] = alignmentsToDelimiter(phantom.map(cellAlignment));
+      lines.splice(i + 1, 1);
+    }
+    const markers = input.metadata.preserveMarkers ?? [];
+    const remaining = [];
+    for (const marker of markers) {
+      if (marker.type !== "table-align" || !marker.params.align || !marker.params.__anchor) {
+        remaining.push(marker);
+        continue;
+      }
+      const anchor = marker.params.__anchor;
+      const idx = lines.findIndex(
+        (line, i) => i < lines.length - 1 && line.trim().startsWith(anchor) && parseDelimiterRow(lines[i + 1]) !== null
+      );
+      if (idx === -1) continue;
+      const delimCells = parseDelimiterRow(lines[idx + 1]);
+      if (lines[idx + 1].includes(":")) continue;
+      const originalLine = marker.params.__line;
+      if (originalLine && parseDelimiterRow(originalLine)?.length === delimCells.length) {
+        lines[idx + 1] = originalLine;
+        continue;
+      }
+      const alignments = marker.params.align.split(",");
+      while (alignments.length < delimCells.length) alignments.push("none");
+      lines[idx + 1] = alignmentsToDelimiter(alignments.slice(0, delimCells.length));
+    }
+    return {
+      content: lines.join("\n"),
+      metadata: { ...input.metadata, preserveMarkers: remaining }
+    };
+  }
+};
+
 // src/converter/post-processors/preserve-marker-injector.ts
 var PreserveMarkerInjector = class {
   name = "PreserveMarkerInjector";
@@ -2633,23 +2919,89 @@ var PreserveMarkerInjector = class {
       return { content: input.content, metadata: input.metadata };
     }
     let content = input.content;
-    const missingMarkers = markers.filter((m) => !content.includes(this.formatMarker(m)));
-    if (missingMarkers.length === 0) {
+    const missing = markers.filter((m) => {
+      const rendered = this.renderMarker(m);
+      if (rendered === null) return false;
+      if (content.includes(rendered)) return false;
+      return !this.isSemanticallyRestored(m, content);
+    });
+    if (missing.length === 0) {
       return { content, metadata: input.metadata };
     }
-    const sorted = [...missingMarkers].sort((a, b) => a.startIndex - b.startIndex);
-    for (const m of sorted) {
-      const markerText = this.formatMarker(m);
-      const at = Math.max(0, Math.min(m.startIndex, content.length));
-      content = content.slice(0, at) + markerText + content.slice(at);
+    const sorted = [...missing].sort((a, b) => a.startIndex - b.startIndex);
+    for (const marker of sorted) {
+      const rendered = this.renderMarker(marker);
+      if (marker.params?.__anchor === void 0) {
+        const at2 = Math.max(frontmatterEnd(content), Math.min(marker.startIndex, content.length));
+        content = content.slice(0, at2) + rendered + content.slice(at2);
+        continue;
+      }
+      const at = this.findInsertionPoint(marker, content);
+      const before = content.slice(0, at);
+      const needsNewline = before.length > 0 && !before.endsWith("\n");
+      content = before + (needsNewline ? "\n" : "") + rendered + "\n" + content.slice(at);
     }
     return { content, metadata: input.metadata };
   }
-  formatMarker(marker) {
-    const params = Object.entries(marker.params).map(([k, v]) => `${k}=${encodeURIComponent(v)}`).join("&");
-    return spacedMarker(`${marker.type}:${params}`);
+  /** 마커의 본문 표현. 복원 불가능한(빈) 마커는 null — 삽입하지 않고 폐기한다. */
+  renderMarker(marker) {
+    const params = marker.params ?? {};
+    if (marker.type === "comment") {
+      return params.text ? `%%${params.text}%%` : null;
+    }
+    if (params.__raw !== void 0) {
+      return spacedMarker(`${marker.type}:${params.__raw}`);
+    }
+    const entries = Object.entries(params).filter(([key]) => !key.startsWith("__"));
+    if (entries.length === 0) return null;
+    const body = entries.map(([k, v]) => `${k}=${encodeURIComponent(v)}`).join("&");
+    return spacedMarker(`${marker.type}:${body}`);
+  }
+  /** 마커가 이미 원래 문법으로 복원돼 있으면 재삽입은 중복·오염이다. */
+  isSemanticallyRestored(marker, content) {
+    const params = marker.params ?? {};
+    switch (marker.type) {
+      case "wikilink": {
+        const text = params.text;
+        if (!text) return false;
+        return content.includes(`[[${text}]]`) || content.includes(`[[${text}|`);
+      }
+      case "local-image":
+      case "local-file": {
+        const target = params.__raw ?? params.path;
+        return target ? content.includes(`![[${target}]]`) : false;
+      }
+      case "table-align":
+        return true;
+      default:
+        return false;
+    }
+  }
+  /** 삽입 위치: 앵커 → startIndex(줄 경계 보정) 순. 항상 프론트매터 뒤. */
+  findInsertionPoint(marker, content) {
+    const fmEnd = frontmatterEnd(content);
+    const anchor = marker.params?.__anchor;
+    if (anchor && anchor.trim().length >= 4) {
+      const idx = content.indexOf(anchor, fmEnd);
+      if (idx !== -1) {
+        return nextLineStart(content, idx + anchor.length);
+      }
+    }
+    const clamped = Math.max(fmEnd, Math.min(marker.startIndex, content.length));
+    return nextLineStart(content, clamped);
   }
 };
+function frontmatterEnd(content) {
+  if (!content.startsWith("---\n")) return 0;
+  const close = content.indexOf("\n---", 3);
+  if (close === -1) return 0;
+  const lineEnd = content.indexOf("\n", close + 4);
+  return lineEnd === -1 ? content.length : lineEnd + 1;
+}
+function nextLineStart(content, pos) {
+  const nl = content.indexOf("\n", pos);
+  return nl === -1 ? content.length : nl + 1;
+}
 
 // src/converter/post-processors/callout-restorer.ts
 var EMOJI_TYPE_MAP = {
@@ -2785,7 +3137,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:([^\\s]+)\\s*%%`,
+  `>\\s*\u{1F4CE}\\s*[^\\n]*\\n>\\s*%%\\s*${MARKER_BRAND_RE}:local-(?:image|file):([^\\s]+)\\s*%%`,
   "g"
 );
 var LocalImageRestorer = class {
@@ -2897,25 +3249,178 @@ function stripQuotes(s) {
   return s;
 }
 
+// src/converter/post-processors/block-spacer.ts
+var BlockSpacer = class {
+  name = "BlockSpacer";
+  order = 110;
+  process(input) {
+    if (input.context.direction !== "pull") {
+      return { content: input.content, metadata: input.metadata };
+    }
+    return {
+      content: respace(input.content, input.metadata.notionExportCompact),
+      metadata: input.metadata
+    };
+  }
+};
+var LIST_ITEM_RE = /^[ \t]*(?:[-*+]|\d+[.)])\s/;
+var QUOTE_RE = /^[ \t]*>/;
+var CALLOUT_START_RE = /^[ \t]*>\s*\[![^\]]*\]/;
+var TABLE_ROW_RE = /^[ \t]*\|/;
+var FOOTNOTE_DEF_RE = /^\[\^[^\]]+\]:/;
+var FENCE_RE = /^[ \t]*(```+|~~~+)/;
+var MATH_FENCE_RE = /^[ \t]*\$\$\s*$/;
+var BRAND_MARKER_LINE_RE = new RegExp(`^[ \\t]*%%\\s*${MARKER_BRAND}:`);
+var INDENTED_CONTINUATION_RE = /^(?:\t| {2,})\S/;
+function respace(content, sourceCompact) {
+  if (sourceCompact === false) return content;
+  const lines = content.split("\n");
+  const head = [];
+  let start = 0;
+  if (lines[0]?.trim() === "---") {
+    for (let i = 1; i < lines.length; i++) {
+      if (lines[i].trim() === "---") {
+        for (let j = 0; j <= i; j++) head.push(lines[j]);
+        start = i + 1;
+        break;
+      }
+    }
+  }
+  if (sourceCompact === void 0 && hasBlankOutsideFences(lines, start)) return content;
+  const blocks = [];
+  let fence = null;
+  let fenceToken = "";
+  let boundary = false;
+  const push = (kind, line) => {
+    blocks.push({ kind, lines: [line] });
+  };
+  const appendToLast = (line) => {
+    blocks[blocks.length - 1].lines.push(line);
+  };
+  const last = () => blocks[blocks.length - 1];
+  for (let i = start; i < lines.length; i++) {
+    const raw = lines[i];
+    if (fence !== null) {
+      appendToLast(raw);
+      const closed = fence === "code" ? FENCE_RE.test(raw) && raw.trim().startsWith(fenceToken) : MATH_FENCE_RE.test(raw);
+      if (closed) fence = null;
+      continue;
+    }
+    if (raw.trim() === "") {
+      boundary = true;
+      continue;
+    }
+    const atBoundary = boundary;
+    boundary = false;
+    const fenceMatch = raw.match(FENCE_RE);
+    if (fenceMatch) {
+      push("fence", raw);
+      fence = "code";
+      fenceToken = fenceMatch[1][0].repeat(3);
+      continue;
+    }
+    if (MATH_FENCE_RE.test(raw)) {
+      push("math", raw);
+      fence = "math";
+      continue;
+    }
+    const line = 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;
+    }
+    if (LIST_ITEM_RE.test(line)) {
+      if (last()?.kind === "list" && !atBoundary) appendToLast(line);
+      else push("list", line);
+      continue;
+    }
+    if (last()?.kind === "list" && INDENTED_CONTINUATION_RE.test(line)) {
+      appendToLast(line);
+      continue;
+    }
+    if (QUOTE_RE.test(line)) {
+      if (last()?.kind === "quote" && !CALLOUT_START_RE.test(line) && !atBoundary) {
+        appendToLast(line);
+      } else {
+        push("quote", line);
+      }
+      continue;
+    }
+    if (TABLE_ROW_RE.test(line)) {
+      if (last()?.kind === "table" && !atBoundary) appendToLast(line);
+      else push("table", line);
+      continue;
+    }
+    if (FOOTNOTE_DEF_RE.test(line)) {
+      if (last()?.kind === "footnote" && !atBoundary) appendToLast(line);
+      else push("footnote", line);
+      continue;
+    }
+    push("other", line);
+  }
+  const body = blocks.map((b) => b.lines.join("\n")).join("\n\n");
+  const tail = content.endsWith("\n") ? "\n" : "";
+  if (head.length === 0) return body + tail;
+  return `${head.join("\n")}
+
+${body}${tail}`;
+}
+function isCompactExport(rawMarkdown) {
+  return !hasBlankOutsideFences(rawMarkdown.split("\n"), 0);
+}
+function hasBlankOutsideFences(lines, start) {
+  let end = lines.length - 1;
+  while (end >= start && lines[end].trim() === "") end--;
+  let fence = null;
+  let fenceToken = "";
+  for (let i = start; i <= end; i++) {
+    const raw = lines[i];
+    if (fence !== null) {
+      const closed = fence === "code" ? FENCE_RE.test(raw) && raw.trim().startsWith(fenceToken) : MATH_FENCE_RE.test(raw);
+      if (closed) fence = null;
+      continue;
+    }
+    const fenceMatch = raw.match(FENCE_RE);
+    if (fenceMatch) {
+      fence = "code";
+      fenceToken = fenceMatch[1][0].repeat(3);
+      continue;
+    }
+    if (MATH_FENCE_RE.test(raw)) {
+      fence = "math";
+      continue;
+    }
+    if (raw.trim() === "") return true;
+  }
+  return false;
+}
+
 // src/converter/pipeline-factory.ts
 function createDefaultPipeline(options) {
   const pipeline = new ConversionPipeline();
   pipeline.registerPreProcessor(new InlineAnnotationPreserver());
   pipeline.registerPreProcessor(new UnsupportedBlockStripper());
+  pipeline.registerPreProcessor(new CommentStripper());
   pipeline.registerPreProcessor(new FrontmatterExtractor());
+  pipeline.registerPreProcessor(new FootnoteGuard());
   pipeline.registerPreProcessor(new PropertiesTableInjector());
   pipeline.registerPreProcessor(new WikilinkResolver(options?.wikilinkResolver));
   pipeline.registerPreProcessor(new CalloutTransformer());
+  pipeline.registerPreProcessor(new TableAlignmentGuard());
   pipeline.registerPreProcessor(new MathNormalizer());
   pipeline.registerPreProcessor(new EmbedResolver());
   pipeline.registerPreProcessor(new PreserveMarkerCollector());
+  pipeline.registerPostProcessor(new EscapeNormalizer());
   pipeline.registerPostProcessor(new PropertiesTableRestorer());
   pipeline.registerPostProcessor(new LocalImageRestorer());
+  pipeline.registerPostProcessor(new HighlightRestorer());
+  pipeline.registerPostProcessor(new TableAlignmentRestorer());
   pipeline.registerPostProcessor(new PreserveMarkerInjector());
   pipeline.registerPostProcessor(new MentionToWikilink());
   pipeline.registerPostProcessor(new CalloutRestorer());
   pipeline.registerPostProcessor(new ColorAnnotator());
   pipeline.registerPostProcessor(new FrontmatterGenerator());
+  pipeline.registerPostProcessor(new BlockSpacer());
   return pipeline;
 }
 
@@ -3728,6 +4233,87 @@ var EXTENSION_TO_MIME = {
   ".ico": "image/x-icon",
   ".tiff": "image/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;
+    let broken = false;
+    while (j < markdown.length && depth > 0) {
+      const ch = markdown[j];
+      if (ch === "\\") {
+        j += 2;
+        continue;
+      }
+      if (ch === "\n" && markdown[j + 1] === "\n") {
+        broken = true;
+        break;
+      }
+      if (ch === "[") depth++;
+      else if (ch === "]") depth--;
+      j++;
+    }
+    if (broken || depth !== 0 || markdown[j] !== "(") {
+      i = open + 1;
+      continue;
+    }
+    const label = markdown.slice(open + 1, j - 1);
+    let parenDepth = 1;
+    let k = j + 1;
+    while (k < markdown.length && parenDepth > 0) {
+      const ch = markdown[k];
+      if (ch === "\\") {
+        k += 2;
+        continue;
+      }
+      if (ch === "\n") {
+        broken = true;
+        break;
+      }
+      if (ch === "(") parenDepth++;
+      else if (ch === ")") parenDepth--;
+      k++;
+    }
+    if (broken || parenDepth !== 0) {
+      i = open + 1;
+      continue;
+    }
+    const start = isEmbed ? open - 1 : open;
+    spans.push({
+      full: markdown.slice(start, k),
+      label,
+      url: markdown.slice(j + 1, k - 1),
+      isEmbed
+    });
+    i = k;
+  }
+  return spans;
+}
+function toWikilinkAlias(label) {
+  return label.replace(/!?\[([^\]]*)\]\(([^)]*)\)/g, "$1").replace(/\[\[([^\]|]+)(?:\|([^\]]+))?\]\]/g, (_m, t, d) => d ?? t).replace(/[\r\n]+/g, " ").replace(/\]\]/g, ")").replace(/\|/g, "-").trim();
+}
+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");
+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]));
+  }
+  return names;
+}
+function baseName(path) {
+  return path.split("/").pop() ?? path;
+}
 var ImageHandler = class {
   constructor(vaultFs, attachmentFolder = "attachments", notionClient, customFetch, options, stateDb) {
     this.vaultFs = vaultFs;
@@ -3753,6 +4339,9 @@ var ImageHandler = class {
     return this.customFetch ?? globalThis.fetch;
   }
   async downloadImage(url, pageTitle) {
+    return this.persistImage(await this.fetchImage(url, pageTitle));
+  }
+  async fetchImage(url, pageTitle) {
     const maxRetries = this.maxRetries;
     let lastError = null;
     for (let attempt = 0; attempt < maxRetries; attempt++) {
@@ -3770,38 +4359,60 @@ var ImageHandler = class {
         const contentType = response.headers.get("content-type") ?? "image/png";
         const extension = IMAGE_EXTENSIONS[contentType] ?? this.guessExtension(url) ?? ".png";
         const buffer = Buffer.from(await response.arrayBuffer());
-        const hash = createHash("sha256").update(buffer).digest("hex").slice(0, 12);
+        const fullHash = createHash("sha256").update(buffer).digest("hex");
+        const hash = fullHash.slice(0, 12);
         const safeName = pageTitle.replace(/[^a-zA-Z0-9가-힣\s-]/g, "").replace(/\s+/g, "-").slice(0, 50);
         const fileName = `${safeName}-${hash}${extension}`;
         const localPath = `${this.attachmentFolder}/${fileName}`;
-        await this.vaultFs.ensureFolder(this.attachmentFolder);
-        await this.vaultFs.writeBinary(localPath, buffer);
-        return { originalUrl: url, localPath, hash, size: buffer.length };
+        return { originalUrl: url, localPath, hash, fullHash, buffer };
       } catch (error) {
         lastError = error instanceof Error ? error : new Error(String(error));
       }
     }
     throw lastError;
   }
-  async downloadAllImages(markdown, pageTitle) {
-    const imageRegex = /!\[([^\]]*)\]\((https?:\/\/[^)]+)\)/g;
-    const matches = [...markdown.matchAll(imageRegex)];
-    const notionMatches = matches.filter((m) => m[2] && this.isNotionImageUrl(m[2]));
-    const internalImageRegex = /!\[([^\]]*)\]\((file:\/\/%7B.*?%7D%7D)\)/g;
-    const internalMatches = [...markdown.matchAll(internalImageRegex)];
+  async persistImage(fetched) {
+    await this.vaultFs.ensureFolder(this.attachmentFolder);
+    await this.vaultFs.writeBinary(fetched.localPath, fetched.buffer);
+    return {
+      originalUrl: fetched.originalUrl,
+      localPath: fetched.localPath,
+      hash: fetched.hash,
+      size: fetched.buffer.length
+    };
+  }
+  async downloadAllImages(markdown, pageTitle, pageId) {
+    const embeds = scanMarkdownLinks(markdown).filter((s) => s.isEmbed);
+    const notionMatches = embeds.filter(
+      (s) => /^https?:\/\//.test(s.url) && this.isNotionImageUrl(s.url)
+    );
+    const internalMatches = embeds.filter((s) => INTERNAL_FILE_URL_RE.test(s.url));
     if (notionMatches.length === 0 && internalMatches.length === 0) {
       return { content: markdown, downloads: [] };
     }
+    const registryByHash = /* @__PURE__ */ new Map();
+    if (pageId && this.stateDb) {
+      for (const entry of this.stateDb.getFilesByPageId(pageId)) {
+        const list = registryByHash.get(entry.fileHash) ?? [];
+        list.push(entry.localPath);
+        registryByHash.set(entry.fileHash, list);
+      }
+    }
+    const markerBasenames = collectLocalMarkerBasenames(markdown);
+    const isAppendedCopy = (fetched) => {
+      const paths = registryByHash.get(fetched.fullHash);
+      return paths !== void 0 && paths.some((p) => markerBasenames.has(baseName(p)));
+    };
     const sema = new Sema(this.concurrency);
     const downloads = [];
     let result = markdown;
     const httpResults = await Promise.allSettled(
-      notionMatches.map(async (match) => {
+      notionMatches.map(async (span) => {
         await sema.acquire();
         try {
           return {
-            match,
-            download: await this.downloadImage(match[2], pageTitle)
+            span,
+            fetched: await this.fetchImage(span.url, pageTitle)
           };
         } finally {
           sema.release();
@@ -3810,26 +4421,37 @@ var ImageHandler = class {
     );
     for (const settled of httpResults) {
       if (settled.status !== "fulfilled") continue;
-      const { match, download } = settled.value;
+      const { span, fetched } = settled.value;
+      if (isAppendedCopy(fetched)) {
+        result = result.replace(span.full, "");
+        continue;
+      }
+      const download = await this.persistImage(fetched);
       downloads.push(download);
-      const obsidianEmbed = `![[${download.localPath}${match[1] ? `|${match[1]}` : ""}]]`;
-      result = result.replace(match[0], obsidianEmbed);
+      const alias = toWikilinkAlias(span.label);
+      const obsidianEmbed = `![[${download.localPath}${alias ? `|${alias}` : ""}]]`;
+      result = result.replace(span.full, obsidianEmbed);
     }
-    for (const match of internalMatches) {
+    for (const span of internalMatches) {
       await sema.acquire();
       try {
-        const fileUrl = match[2];
-        const parsed = this.parseNotionFileUrl(fileUrl);
+        const parsed = this.parseNotionFileUrl(span.url);
         if (!parsed || !this.notionClient) continue;
         const realUrl = await this.notionClient.getFileBlockUrl(parsed.blockId);
         if (!realUrl) {
           getLogger().warn(`[Im-Nobsidian] \uC774\uBBF8\uC9C0 Block URL \uC870\uD68C \uC2E4\uD328: ${parsed.fileName}`);
           continue;
         }
-        const download = await this.downloadImage(realUrl, pageTitle);
+        const fetched = await this.fetchImage(realUrl, pageTitle);
+        if (isAppendedCopy(fetched)) {
+          result = result.replace(span.full, "");
+          continue;
+        }
+        const download = await this.persistImage(fetched);
         downloads.push(download);
-        const obsidianEmbed = `![[${download.localPath}${match[1] ? `|${match[1]}` : ""}]]`;
-        result = result.replace(match[0], obsidianEmbed);
+        const alias = toWikilinkAlias(span.label);
+        const obsidianEmbed = `![[${download.localPath}${alias ? `|${alias}` : ""}]]`;
+        result = result.replace(span.full, obsidianEmbed);
       } catch (error) {
         getLogger().warn(`\uB0B4\uBD80 \uC774\uBBF8\uC9C0 \uB2E4\uC6B4\uB85C\uB4DC \uC2E4\uD328: ${error}`);
       } finally {
@@ -3838,27 +4460,28 @@ var ImageHandler = class {
     }
     return { content: result, downloads };
   }
-  async uploadLocalImage(localPath) {
+  async uploadLocalImage(localPath, noteFolder) {
     if (!this.notionClient) {
       throw new Error("NotionClient required for image upload");
     }
-    const buffer = await this.readImageFromVault(localPath);
+    const { buffer, resolvedPath } = await this.readImageFromVault(localPath, noteFolder);
     const filename = localPath.split("/").pop() ?? "image.png";
     const contentType = this.getContentTypeFromPath(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");
-    return { localPath, fileUploadId, fileHash, fileSize: buffer.length };
+    return { localPath: resolvedPath, fileUploadId, fileHash, fileSize: buffer.length };
   }
-  async uploadAndAppendImages(pageId, images) {
+  async uploadAndAppendImages(pageId, images, notePath) {
     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 results = [];
     const imageBlocks = [];
     for (const img of localImages) {
       try {
-        const result = await this.uploadLocalImage(img.localPath);
+        const result = await this.uploadLocalImage(img.localPath, noteFolder);
         results.push(result);
         imageBlocks.push({
           type: "image",
@@ -3868,7 +4491,11 @@ var ImageHandler = class {
           }
         });
       } catch (error) {
-        getLogger().warn(`\uC774\uBBF8\uC9C0 \uC5C5\uB85C\uB4DC \uC2E4\uD328 (${img.localPath}):`, error);
+        if (error?.code === "ENOENT") {
+          getLogger().warn(`\uC774\uBBF8\uC9C0 \uC5C5\uB85C\uB4DC \uAC74\uB108\uB700 \u2014 \uBCFC\uD2B8\uC5D0\uC11C \uD30C\uC77C\uC744 \uCC3E\uC9C0 \uBABB\uD568: ${img.localPath}`);
+        } else {
+          getLogger().warn(`\uC774\uBBF8\uC9C0 \uC5C5\uB85C\uB4DC \uC2E4\uD328 (${img.localPath}):`, error);
+        }
       }
     }
     if (imageBlocks.length > 0) {
@@ -3892,23 +4519,39 @@ var ImageHandler = class {
     }
     return results;
   }
-  async readImageFromVault(localPath) {
-    try {
-      return await this.vaultFs.readBinary(localPath);
-    } catch {
-      return await this.vaultFs.readBinary(`${this.attachmentFolder}/${localPath}`);
+  /**
+   * 임베드 경로를 볼트 실제 파일로 해석한다(F23). Obsidian 위키링크 임베드는 노트 옆
+   * 파일을 파일명만으로 참조하는 게 관례라, 노트 폴더 → 볼트 루트 → attachments/ 순으로
+   * 시도한다. 폴백은 조용히 진행하고, 전부 실패했을 때만 마지막 오류를 던진다.
+   */
+  async readImageFromVault(localPath, noteFolder) {
+    const candidates = [];
+    if (noteFolder && !localPath.includes("/")) {
+      candidates.push(`${noteFolder}/${localPath}`);
+    }
+    candidates.push(localPath, `${this.attachmentFolder}/${localPath}`);
+    let lastError;
+    for (const candidate of candidates) {
+      try {
+        return { buffer: await this.vaultFs.readBinary(candidate), resolvedPath: candidate };
+      } catch (error) {
+        lastError = error;
+      }
     }
+    throw lastError;
   }
   getContentTypeFromPath(filename) {
     const ext = filename.match(/\.[^.]+$/)?.[0]?.toLowerCase();
     return (ext && EXTENSION_TO_MIME[ext]) ?? "application/octet-stream";
   }
   async downloadAllFiles(markdown, pageTitle) {
-    const mdLinkRegex = /\[(?:📎|🎬|🎞|📄|🔊)\s*([^\]]*)\]\((https?:\/\/[^)]+)\)/g;
-    const mdHttpMatches = [...markdown.matchAll(mdLinkRegex)];
-    const notionHttpMatches = mdHttpMatches.filter((m) => m[2] && this.isNotionFileUrl(m[2]));
-    const mdInternalRegex = /\[(?:📎|🎬|🎞|📄|🔊)\s*([^\]]*)\]\((file:\/\/%7B.*?%7D%7D)\)/g;
-    const mdInternalMatches = [...markdown.matchAll(mdInternalRegex)];
+    const fileLinks = scanMarkdownLinks(markdown).filter(
+      (s) => !s.isEmbed && FILE_LABEL_PREFIX_RE.test(s.label)
+    );
+    const notionHttpMatches = fileLinks.filter(
+      (s) => /^https?:\/\//.test(s.url) && this.isNotionFileUrl(s.url)
+    );
+    const mdInternalMatches = fileLinks.filter((s) => INTERNAL_FILE_URL_RE.test(s.url));
     const xmlHttpRegex = /<(?:file|video|audio|pdf)\s+src="(https?:\/\/[^"]+)">([\s\S]*?)<\/(?:file|video|audio|pdf)>/g;
     const xmlHttpMatches = [...markdown.matchAll(xmlHttpRegex)];
     const notionXmlHttpMatches = xmlHttpMatches.filter((m) => m[1] && this.isNotionFileUrl(m[1]));
@@ -3921,38 +4564,36 @@ var ImageHandler = class {
     const sema = new Sema(this.concurrency);
     const downloads = [];
     let result = markdown;
-    for (const match of notionHttpMatches) {
+    for (const span of notionHttpMatches) {
       await sema.acquire();
       try {
-        const url = match[2];
-        const caption = match[1]?.trim() || "file";
-        const download = await this.downloadFile(url, pageTitle, caption);
+        const caption = toWikilinkAlias(span.label.replace(FILE_LABEL_PREFIX_RE, "")) || "file";
+        const download = await this.downloadFile(span.url, pageTitle, caption);
         if (!download.localPath) continue;
         downloads.push(download);
-        const obsidianLink = `[[${download.localPath}|${caption}]]`;
-        result = result.replace(match[0], obsidianLink);
+        const obsidianLink = `![[${download.localPath}|${caption}]]`;
+        result = result.replace(span.full, obsidianLink);
       } catch (error) {
         getLogger().warn(`\uD30C\uC77C \uB2E4\uC6B4\uB85C\uB4DC \uC2E4\uD328: ${error}`);
       } finally {
         sema.release();
       }
     }
-    for (const match of mdInternalMatches) {
+    for (const span of mdInternalMatches) {
       await sema.acquire();
       try {
-        const fileUrl = match[2];
-        const parsed = this.parseNotionFileUrl(fileUrl);
+        const parsed = this.parseNotionFileUrl(span.url);
         if (!parsed || !this.notionClient) continue;
         const blockId = parsed.blockId;
         const fileName = parsed.fileName;
         const realUrl = await this.notionClient.getFileBlockUrl(blockId);
         if (!realUrl) continue;
-        const caption = fileName || match[1]?.trim() || "file";
+        const caption = fileName || toWikilinkAlias(span.label.replace(FILE_LABEL_PREFIX_RE, "")) || "file";
         const download = await this.downloadFile(realUrl, pageTitle, caption);
         if (!download.localPath) continue;
         downloads.push(download);
-        const obsidianLink = `[[${download.localPath}|${caption}]]`;
-        result = result.replace(match[0], obsidianLink);
+        const obsidianLink = `![[${download.localPath}|${caption}]]`;
+        result = result.replace(span.full, obsidianLink);
       } catch (error) {
         getLogger().warn(`\uB0B4\uBD80 \uD30C\uC77C \uB2E4\uC6B4\uB85C\uB4DC \uC2E4\uD328: ${error}`);
       } finally {
@@ -3963,11 +4604,11 @@ var ImageHandler = class {
       await sema.acquire();
       try {
         const url = match[1];
-        const caption = match[2]?.trim() || "file";
+        const caption = toWikilinkAlias(match[2] ?? "") || "file";
         const download = await this.downloadFile(url, pageTitle, caption);
         if (!download.localPath) continue;
         downloads.push(download);
-        const obsidianLink = `[[${download.localPath}|${caption}]]`;
+        const obsidianLink = `![[${download.localPath}|${caption}]]`;
         result = result.replace(match[0], obsidianLink);
       } catch (error) {
         getLogger().warn(`\uD30C\uC77C \uB2E4\uC6B4\uB85C\uB4DC \uC2E4\uD328: ${error}`);
@@ -3985,11 +4626,11 @@ var ImageHandler = class {
         const fileName = parsed.fileName;
         const realUrl = await this.notionClient.getFileBlockUrl(blockId);
         if (!realUrl) continue;
-        const caption = fileName || match[2]?.trim() || "file";
+        const caption = fileName || toWikilinkAlias(match[2] ?? "") || "file";
         const download = await this.downloadFile(realUrl, pageTitle, caption);
         if (!download.localPath) continue;
         downloads.push(download);
-        const obsidianLink = `[[${download.localPath}|${caption}]]`;
+        const obsidianLink = `![[${download.localPath}|${caption}]]`;
         result = result.replace(match[0], obsidianLink);
       } catch (error) {
         getLogger().warn(`\uB0B4\uBD80 \uD30C\uC77C \uB2E4\uC6B4\uB85C\uB4DC \uC2E4\uD328: ${error}`);
@@ -5257,7 +5898,7 @@ function unescapeNotionChars(content) {
   return content.replace(/\\~/g, "~").replace(/\\\^/g, "^");
 }
 var NOTION_TABLE_RE = /<table[^>]*>([\s\S]*?)<\/table>/g;
-var TABLE_ROW_RE = /<tr>([\s\S]*?)<\/tr>/g;
+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()));
@@ -5266,7 +5907,7 @@ function convertNotionTables(content) {
   return content.replace(NOTION_TABLE_RE, (_match, tableBody) => {
     const rows = [];
     let rowMatch;
-    const rowRe = new RegExp(TABLE_ROW_RE.source, TABLE_ROW_RE.flags);
+    const rowRe = new RegExp(TABLE_ROW_RE2.source, TABLE_ROW_RE2.flags);
     while ((rowMatch = rowRe.exec(tableBody)) !== null) {
       const cells = [];
       let cellMatch;
@@ -5647,8 +6288,10 @@ var DatabaseSyncer = class {
       properties.icon = icon.value;
     }
     let markdown = "";
+    let exportCompact = false;
     try {
       const mdResult = await this.notionClient.getPageMarkdown(page.id);
+      exportCompact = isCompactExport(mdResult.markdown);
       markdown = notionEnhancedToObsidian(mdResult.markdown);
     } catch {
     }
@@ -5688,7 +6331,7 @@ var DatabaseSyncer = class {
         filePath,
         parentMode: "database"
       },
-      { properties }
+      { properties, notionExportCompact: exportCompact }
     );
     if (existingRecord) {
       let localContent = "";
@@ -6089,8 +6732,8 @@ var ConflictResolver = class {
   async resolveDuplicate(conflict) {
     const originalPath = conflict.syncRecord.obsidianPath;
     const ext = originalPath.endsWith(".md") ? ".md" : "";
-    const baseName = originalPath.replace(/\.md$/, "");
-    const conflictPath = `${baseName}.conflict${ext}`;
+    const baseName2 = originalPath.replace(/\.md$/, "");
+    const conflictPath = `${baseName2}.conflict${ext}`;
     await this.vaultFs.writeFile(conflictPath, conflict.remoteContent);
     const localHash = computeHash(conflict.localContent);
     this.stateDb.updateHash(
@@ -6179,6 +6822,7 @@ function resolveFrontmatterRelations(content, idToTitle) {
 
 // src/sync/orchestrator.ts
 var INACCESSIBLE_DBS_META_KEY = "inaccessible_dbs";
+var INCREMENTAL_SAFETY_WINDOW_MS = 15 * 6e4;
 function strategyToChoice(strategy) {
   switch (strategy) {
     case "local-first":
@@ -6479,7 +7123,12 @@ var SyncOrchestrator = class _SyncOrchestrator {
       return record && options.paths.some((p) => record.obsidianPath.startsWith(p));
     }) : remoteChanges;
     if (filtered.length === 0 && (this.config.notion.databases?.length ?? 0) === 0) {
-      const dbDiscovery = await this.pullDiscoveredDatabases(writtenPaths, failed, conflicts);
+      const dbDiscovery = await this.pullDiscoveredDatabases(
+        writtenPaths,
+        failed,
+        conflicts,
+        options?.force === true
+      );
       return finalize(dbDiscovery.created, dbDiscovery.updated, 0);
     }
     if (filtered.length === 0) {
@@ -6606,7 +7255,12 @@ var SyncOrchestrator = class _SyncOrchestrator {
       }
     }
     {
-      const dbDiscovery = await this.pullDiscoveredDatabases(writtenPaths, failed, conflicts);
+      const dbDiscovery = await this.pullDiscoveredDatabases(
+        writtenPaths,
+        failed,
+        conflicts,
+        options?.force === true
+      );
       counts.created += dbDiscovery.created;
       counts.updated += dbDiscovery.updated;
     }
@@ -6698,7 +7352,7 @@ var SyncOrchestrator = class _SyncOrchestrator {
       let remoteContent = "";
       if (record.notionPageId) {
         try {
-          remoteContent = await this.fetchPageMarkdown(record.notionPageId);
+          remoteContent = (await this.fetchPageMarkdown(record.notionPageId)).content;
         } catch {
         }
       }
@@ -6795,7 +7449,7 @@ var SyncOrchestrator = class _SyncOrchestrator {
       return /* @__PURE__ */ new Set();
     }
   }
-  async pullDiscoveredDatabases(writtenPaths, failed, conflicts) {
+  async pullDiscoveredDatabases(writtenPaths, failed, conflicts, forceRediscovery = false) {
     if (this.isDatabaseMode) return { created: 0, updated: 0 };
     let created = 0;
     let updated = 0;
@@ -6829,7 +7483,7 @@ var SyncOrchestrator = class _SyncOrchestrator {
           `[Im-Nobsidian] DB ${rawId}: \uC811\uADFC \uAC00\uB2A5\uD55C data source \uC5C6\uC74C(\uB9C1\uD06C\uB4DC/\uBBF8\uACF5\uC720/\uC0AD\uC81C \uCD94\uC815) \u2014 \uB3D9\uAE30\uD654 \uB300\uC0C1\uC5D0\uC11C \uC81C\uC678(\uC81C\uBAA9\uC740 \uBD80\uBAA8 \uD398\uC774\uC9C0\uC5D0 \uBCF4\uC874)`
         );
       };
-      if (dbConfigs.length === 0) {
+      if (dbConfigs.length === 0 || forceRediscovery) {
         const discovered = await this.discoverChildDatabases();
         for (const { dbId, parentPageId } of discovered) {
           const nohyph = dbId.replace(/-/g, "");
@@ -7035,7 +7689,7 @@ var SyncOrchestrator = class _SyncOrchestrator {
       localMtime: null,
       localFileSize: null
     });
-    await this.imageHandler.uploadAndAppendImages(page.id, conversionResult.images);
+    await this.imageHandler.uploadAndAppendImages(page.id, conversionResult.images, path);
     const hash = computeHash(content);
     const fileStat = await this.vaultFs.getFileStat(path);
     this.stateDb.transaction(() => {
@@ -7081,7 +7735,11 @@ 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);
+    await this.imageHandler.uploadAndAppendImages(
+      record.notionPageId,
+      conversionResult.images,
+      path
+    );
     let propsToUpdate;
     if (this.isDatabaseMode && conversionResult.properties && Object.keys(conversionResult.properties).length > 0) {
       await this.ensureDbSchema();
@@ -7305,7 +7963,9 @@ var SyncOrchestrator = class _SyncOrchestrator {
   async detectRemoteChangesIncremental(since) {
     const changes = [];
     this._childParentIds.clear();
-    const recentPages = await this.notionClient.searchRecentPages(since);
+    const sinceMs = Date.parse(since);
+    const safeSince = Number.isFinite(sinceMs) ? new Date(sinceMs - INCREMENTAL_SAFETY_WINDOW_MS).toISOString() : since;
+    const recentPages = await this.notionClient.searchRecentPages(safeSince);
     for (const page of recentPages) {
       const record = this.stateDb.getByNotionId(page.id);
       if (!record) {
@@ -7346,7 +8006,7 @@ var SyncOrchestrator = class _SyncOrchestrator {
     const safeName = sanitizeFileName(title);
     const parentPath = await this.resolveParentPath(page);
     const hasChildPages = await this.pageHasChildContainers(pageId);
-    const markdown = await this.fetchPageMarkdown(pageId);
+    const { content: markdown, compact: exportCompact } = await this.fetchPageMarkdown(pageId);
     const hasContent = markdown.trim().length > 0;
     let filePath;
     let fileType;
@@ -7374,10 +8034,12 @@ var SyncOrchestrator = class _SyncOrchestrator {
     } else {
       properties = this.notionClient.extractProperties(page);
     }
-    properties.title = title;
+    if (this.isDatabaseMode || extractTitle(filePath) !== title) {
+      properties.title = title;
+    }
     let processedMarkdown = markdown;
     if (this.config.conversion.imageDownload === "immediate") {
-      const imageResult = await this.imageHandler.downloadAllImages(markdown, title);
+      const imageResult = await this.imageHandler.downloadAllImages(markdown, title, pageId);
       processedMarkdown = imageResult.content;
       this._pullImageCount += imageResult.downloads.length;
     }
@@ -7392,7 +8054,7 @@ var SyncOrchestrator = class _SyncOrchestrator {
         filePath,
         parentMode: this.config.notion.parentMode
       },
-      { properties }
+      { properties, notionExportCompact: exportCompact }
     );
     const resolvedParentId = await this.extractParentId(page);
     await this.vaultFs.writeFile(filePath, finalContent);
@@ -7449,7 +8111,8 @@ var SyncOrchestrator = class _SyncOrchestrator {
     const record = this.stateDb.getByNotionId(change.pageId);
     if (!record) return {};
     const page = await this.notionClient.getPage(change.pageId);
-    let markdown = await this.fetchPageMarkdown(change.pageId);
+    const fetched = await this.fetchPageMarkdown(change.pageId);
+    let markdown = fetched.content;
     const title = this.notionClient.extractTitle(page);
     let properties;
     if (this.isDatabaseMode) {
@@ -7460,9 +8123,11 @@ var SyncOrchestrator = class _SyncOrchestrator {
     } else {
       properties = this.notionClient.extractProperties(page);
     }
-    properties.title = title;
+    if (this.isDatabaseMode || extractTitle(record.obsidianPath) !== title) {
+      properties.title = title;
+    }
     if (this.config.conversion.imageDownload === "immediate") {
-      const imageResult = await this.imageHandler.downloadAllImages(markdown, title);
+      const imageResult = await this.imageHandler.downloadAllImages(markdown, title, change.pageId);
       markdown = imageResult.content;
       this._pullImageCount += imageResult.downloads.length;
     }
@@ -7478,7 +8143,11 @@ var SyncOrchestrator = class _SyncOrchestrator {
         filePath: record.obsidianPath,
         parentMode: this.config.notion.parentMode
       },
-      { properties, preserveMarkers: savedMarkers.length > 0 ? savedMarkers : void 0 }
+      {
+        properties,
+        preserveMarkers: savedMarkers.length > 0 ? savedMarkers : void 0,
+        notionExportCompact: fetched.compact
+      }
     );
     let localContent;
     try {
@@ -7739,11 +8408,16 @@ var SyncOrchestrator = class _SyncOrchestrator {
       try {
         const result = await this.notionClient.getPageMarkdown(pageId);
         this.collectInlineDbRefs(pageId, result.markdown);
-        return this.resolveNotionIdWikilinks(notionEnhancedToObsidian(result.markdown));
+        return {
+          content: this.resolveNotionIdWikilinks(notionEnhancedToObsidian(result.markdown)),
+          // 압축형 판정은 반드시 원시 export 기준 — enhanced 변환이 <empty-block/> 을
+          // 빈 줄로 바꾼 뒤에는 BlockSpacer 가 저작형과 구분할 수 없다(D1).
+          compact: isCompactExport(result.markdown)
+        };
       } catch {
       }
     }
-    return this.blockConverter.notionBlocksToMarkdown(pageId);
+    return { content: await this.blockConverter.notionBlocksToMarkdown(pageId), compact: false };
   }
   // Markdown API는 인라인 데이터베이스를 다음처럼 렌더한다(컬럼/synced_block 내부 포함):
   //   <database url="https://www.notion.so/<id-nohyph>" inline="true"