@im-nobsidian/core 0.11.0 → 0.12.0

package/dist/index.js

@@ -1,6 +1,6 @@
 import { z } from 'zod';
 import { LogLevel, Client } from '@notionhq/client';
-import { readFile, mkdir, writeFile, unlink, rename, stat, readdir } from 'fs/promises';
+import { readFile, mkdir, writeFile, unlink, rmdir, rename, stat, readdir } from 'fs/promises';
 import { join, dirname, sep, relative } from 'path';
 import { mkdirSync, unlinkSync, utimesSync, openSync, writeSync, closeSync, readFileSync, statSync, existsSync, readlinkSync } from 'fs';
 import Database from 'better-sqlite3';
@@ -1476,6 +1476,13 @@ function normalizeAnnotations(annotations) {
   };
 }
 var DEFAULT_STYLE = JSON.stringify(normalizeAnnotations(void 0));
+function titleRunsOf(properties) {
+  for (const prop of Object.values(properties)) {
+    const value = prop;
+    if (value?.type === "title") return Array.isArray(value.title) ? value.title : null;
+  }
+  return null;
+}
 function stringifyFrontmatter(content, data) {
   const astral = maskAstralCharacters(data);
   const out = matter.stringify(
@@ -1660,6 +1667,7 @@ function notionFileIdOf(url) {
 }
 function fileUrlOfBlock(block) {
   const media = block.type ? block[block.type] : void 0;
+  if (block.type === "embed") return media?.url ?? null;
   return media?.file?.url ?? media?.external?.url ?? null;
 }
 
@@ -1879,6 +1887,13 @@ var PropertyMapper = class _PropertyMapper {
   relationKeys(keys) {
     return keys.filter((key) => this.schema.get(key)?.type === "relation");
   }
+  /** 이 속성들 가운데 Notion 이 값을 정하는 것(수식 · 롤업 · ID · 생성일 …) — 볼트에서 고쳐도 보낼 수 없다. */
+  readOnlyKeys(keys) {
+    return keys.filter((key) => {
+      const type = this.schema.get(key)?.type;
+      return type !== void 0 && READ_ONLY_TYPES.has(type);
+    });
+  }
   /**
    * 값을 보낼 수 있는 속성만, pull 이 적는 모양으로 — 원격 값과 로컬 값을 견줄 때 쓴다.
    *
@@ -2307,13 +2322,6 @@ function dateText(value, zone) {
   if (!DATE_REGEX.test(text)) return null;
   return isWallTime(text) ? toZonedIso(text, zone) : text;
 }
-function titleRunsOf(remote) {
-  for (const prop of Object.values(remote)) {
-    const value = prop;
-    if (value?.type === "title") return Array.isArray(value.title) ? value.title : null;
-  }
-  return null;
-}
 function richTextRunsOf(remote, key) {
   const value = remote?.[key];
   return value?.type === "rich_text" && Array.isArray(value.rich_text) ? value.rich_text : null;
@@ -2762,8 +2770,7 @@ function isNotionAccessDenied(error) {
   return e.code === "restricted_resource" || e.status === 403;
 }
 function isTrashedOrArchived(page) {
-  const inTrash = page.in_trash === true;
-  return inTrash || page.archived === true;
+  return page.in_trash === true || page.archived === true;
 }
 function isNotionBadRequest(error) {
   return notionStatusOf(error) === 400;
@@ -2796,6 +2803,7 @@ var DiscoveryTooLargeError = class extends Error {
   partial;
 };
 var NOT_IDEMPOTENT = { idempotent: false };
+var CREATES_BLOCKS = { idempotent: false, createsBlocks: true };
 function parentDatabaseIdOf(page) {
   const parent = page.parent;
   if (parent?.type !== "data_source_id" && parent?.type !== "database_id") return null;
@@ -2841,8 +2849,8 @@ var NotionClient = class _NotionClient {
         // 전역 쿨다운 밖에서, 로그 없이 흐른다.
         retry: false,
         // SDK 5.27+ 는 브라우저 환경(Obsidian 렌더러)에서 토큰을 받으면 던진다 — 남이 여는 페이지에 토큰이 실리는
-        // 것을 막는 검사다. 플러그인의 토큰은 사용자 기기의 볼트 설정에 있다. 5.23 은 이 옵션을 모른다(무시).
-        ...{ dangerouslyAllowBrowser: true },
+        // 것을 막는 검사다. 플러그인의 토큰은 사용자 기기의 볼트 설정에 있다.
+        dangerouslyAllowBrowser: true,
         ...options.fetch ? { fetch: options.fetch } : {}
       },
       options.notifications ?? DEFAULT_CONFIG.sync.notifications
@@ -2953,7 +2961,7 @@ var NotionClient = class _NotionClient {
         properties,
         children: params.children
       }),
-      NOT_IDEMPOTENT
+      CREATES_BLOCKS
     );
   }
   /**
@@ -2978,7 +2986,7 @@ var NotionClient = class _NotionClient {
           }
         })
       ),
-      NOT_IDEMPOTENT
+      CREATES_BLOCKS
     );
     const dataSourceId = db.data_sources?.[0]?.id ?? await this.primaryDataSourceId(db.id);
     if (!dataSourceId) throw new Error(`\uB9CC\uB4E0 DB(${db.id})\uC758 data source \uB97C \uC54C \uC218 \uC5C6\uC74C`);
@@ -3023,7 +3031,7 @@ var NotionClient = class _NotionClient {
         properties,
         markdown: params.markdown
       }),
-      NOT_IDEMPOTENT
+      CREATES_BLOCKS
     );
   }
   /**
@@ -3438,7 +3446,7 @@ var NotionClient = class _NotionClient {
     });
   }
   async archivePage(pageId) {
-    await this.withRateLimit(() => this.client.pages.update({ page_id: pageId, archived: true }));
+    await this.withRateLimit(() => this.client.pages.update({ page_id: pageId, in_trash: true }));
   }
   /**
    * 파일 블록의 지금 받을 수 있는 주소. 블록이 없거나 볼 수 없으면 null 이다.
@@ -3582,7 +3590,7 @@ var NotionClient = class _NotionClient {
           children: batch,
           ...after ? { position: { type: "after_block", after_block: { id: after } } } : {}
         }),
-        NOT_IDEMPOTENT
+        CREATES_BLOCKS
       );
       const blocks = response.results.slice(0, batch.length);
       created.push(...blocks);
@@ -4086,6 +4094,12 @@ var NotionClient = class _NotionClient {
    * 슬롯을 붙잡아 남을 막는 대신, 다 같이 보는 이 게이트로 쉬게 한다.
    */
   cooldownUntil = 0;
+  /**
+   * Free 워크스페이스 블록 한도에 막힌 거절과 그 시각. 막힌 동안 블록을 만드는 요청은 보내지 않고 이 거절을 그대로
+   * 돌려준다 — 플랜을 올리기 전에는 풀리지 않으므로 노트마다 같은 거절을 받으러 가지 않는다. 그 사이 플랜을
+   * 올렸을 수 있어 {@link BLOCK_LIMIT_RECHECK_MS} 가 지나면 다시 보내 본다.
+   */
+  blockLimit = null;
   /**
    * 요청 1건을 rate limit 슬롯 안에서 실행하고, 재시도 가능한 실패는 백오프 후 다시 시도한다.
    *
@@ -4106,6 +4120,10 @@ var NotionClient = class _NotionClient {
    */
   async withRateLimit(fn, options) {
     const idempotent = options?.idempotent ?? true;
+    if (options?.createsBlocks && this.blockLimit) {
+      if (Date.now() - this.blockLimit.at < BLOCK_LIMIT_RECHECK_MS) throw this.blockLimit.error;
+      this.blockLimit = null;
+    }
     this.requestsSent++;
     let backoffMs = 0;
     for (let attempt = 0; ; attempt++) {
@@ -4115,6 +4133,12 @@ var NotionClient = class _NotionClient {
         this.lastRequestTime = Date.now();
         return await fn();
       } catch (error) {
+        if (isWorkspaceBlockLimit(error)) {
+          const limited = new NotionBlockLimitError(error);
+          this.blockLimit = { error: limited, at: Date.now() };
+          getLogger().warn(`[Im-Nobsidian] ${limited.message}`);
+          throw limited;
+        }
         if (!isRetryable(error, idempotent) || 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);
@@ -4179,10 +4203,31 @@ function isAmbiguousFailure(error) {
   return status === 500 || status === 502 || status === 503 || status === 504;
 }
 function isRequestBlocked(error) {
-  if (notionStatusOf(error) !== 429) return false;
+  return rateLimitReasonOf(error) === "public_api_request_blocked";
+}
+function rateLimitReasonOf(error) {
+  if (notionStatusOf(error) !== 429) return null;
   const data = error.additional_data;
-  return data?.rate_limit_reason === "public_api_request_blocked";
+  return typeof data?.rate_limit_reason === "string" ? data.rate_limit_reason : null;
 }
+function isWorkspaceBlockLimit(error) {
+  if (notionStatusOf(error) !== 403) return false;
+  const data = error.additional_data;
+  return data?.block_limit !== void 0 && data.block_limit !== null;
+}
+var BLOCK_LIMIT_RECHECK_MS = 5 * 6e4;
+var NotionBlockLimitError = class extends Error {
+  status = 403;
+  code = "restricted_resource";
+  constructor(cause) {
+    const reason = cause instanceof Error ? cause.message : String(cause);
+    super(
+      `Notion \uC6CC\uD06C\uC2A4\uD398\uC774\uC2A4\uAC00 \uBB34\uB8CC \uBE14\uB85D \uD55C\uB3C4\uB97C \uB2E4 \uC368\uC11C \uC0C8 \uB0B4\uC6A9\uC744 \uB9CC\uB4E4 \uC218 \uC5C6\uC74C \u2014 Notion \uC5D0\uC11C \uD50C\uB79C\uC744 \uC62C\uB9AC\uBA74 \uD480\uB9B0\uB2E4 (Notion: ${reason})`,
+      { cause }
+    );
+    this.name = "NotionBlockLimitError";
+  }
+};
 function isRetryable(error, idempotent) {
   if (isRequestBlocked(error)) return false;
   return isExplicitRejection(error) || idempotent && isAmbiguousFailure(error);
@@ -4193,10 +4238,13 @@ function describeRetryCause(error) {
   const parts = [];
   if (typeof e.status === "number") parts.push(`status ${e.status}`);
   if (typeof e.code === "string") parts.push(e.code);
+  const reason = rateLimitReasonOf(error);
+  if (reason) parts.push(reason);
   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;
+var MAX_SHARED_RETRY_AFTER_MS = 5 * 6e4;
 function readHeader(headers, name) {
   if (typeof headers !== "object" || headers === null) return null;
   const get = headers.get;
@@ -4223,7 +4271,8 @@ function extractRetryAfter(error) {
     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);
+  const cap = rateLimitReasonOf(error) === "public_api_space_request_rate_limit" ? MAX_SHARED_RETRY_AFTER_MS : MAX_RETRY_AFTER_MS;
+  return Math.min(ms, cap);
 }
 function sleep(ms) {
   return new Promise((resolve2) => setTimeout(resolve2, ms));
@@ -5061,6 +5110,7 @@ function deferredSyncedRefMarker(index) {
 }
 var TOGGLE_START = compactMarker("toggle:start");
 var TOGGLE_END = compactMarker("toggle:end");
+var LARGE_FILE_MARKER = compactMarker("large-file");
 var TOGGLE_HEADING_START = compactMarker("toggle-heading");
 var TOGGLE_HEADING_END = compactMarker("toggle-heading:end");
 function calloutIndentMarker(depth2) {
@@ -5143,7 +5193,6 @@ var MARKER_TOKEN_RE = new RegExp(
 
 // src/converter/pipeline.ts
 var INLINE_DB_PROBE = new RegExp(`%% ${MARKER_BRAND_RE}:inline-db`);
-var TOGGLE_HEADING_PROBE = new RegExp(`%% ${MARKER_BRAND_RE}:toggle-heading`);
 var ConversionPipeline = class {
   preProcessors = [];
   postProcessors = [];
@@ -5155,11 +5204,14 @@ var ConversionPipeline = class {
     this.postProcessors.push(processor);
     this.postProcessors.sort((a, b) => a.order - b.order);
   }
+  /**
+   * 토글 헤딩은 Markdown API 경로가 변환한다(`toggle-heading.ts`) — 블록 경로로 보내면 콜아웃이 옛 이모지 꼴로
+   * 바뀐다(`CalloutTransformer`). 예전에 여기 있던 토글 헤딩 탐지는 띄어 쓴 마커를 찾아 한 번도 맞지 않았다.
+   */
   selectPath(content) {
     const hasInlineDb = INLINE_DB_PROBE.test(content);
     const hasColumnLayout2 = />\s*\[!col\]/.test(content);
-    const hasToggleHeading = TOGGLE_HEADING_PROBE.test(content);
-    if (hasInlineDb || hasColumnLayout2 || hasToggleHeading) {
+    if (hasInlineDb || hasColumnLayout2) {
       return "block-api";
     }
     return "markdown-api";
@@ -5788,6 +5840,27 @@ function obsidianMathCloseAt(line, open) {
   return close;
 }
 
+// src/converter/media-labels.ts
+var MEDIA_LABELS = {
+  audio: "\u{1F50A}",
+  video: "\u{1F3AC}",
+  pdf: "\u{1F4C4}",
+  file: "\u{1F4CE}",
+  html: "\u{1F310}"
+};
+var LEGACY_MEDIA_ICONS = ["\u{1F39E}"];
+var MEDIA_PLACEHOLDER_CAPTIONS = new Set(Object.keys(MEDIA_LABELS));
+function mediaLabel(kind, caption) {
+  return `${MEDIA_LABELS[kind]} ${caption || kind}`;
+}
+function mediaLinkRe(kind) {
+  return new RegExp(`\\[${MEDIA_LABELS[kind]}\\s*([^\\]]*)\\]\\(([^)]+)\\)`, "g");
+}
+var MEDIA_LABEL_PREFIX_RE = new RegExp(
+  `^(?:${[...Object.values(MEDIA_LABELS), ...LEGACY_MEDIA_ICONS].join("|")})\\s*`,
+  "u"
+);
+
 // src/converter/container-head.ts
 var CALLOUT_HEAD_LINE_RE = /^([ \t]{0,3})> \[!(\w+)\]([-+])?[ \t]*(.*)$/;
 var TOGGLE_HEAD_SOURCE = String.raw`^([ \t]{0,3})> \[!toggle\]-`;
@@ -5862,7 +5935,7 @@ var EmbedResolver = class {
       (match, alt, url, offset) => {
         if (code.some(([start, end]) => offset >= start && offset < end)) return match;
         if (isVideoUrl(url)) {
-          return `[\u{1F3AC} ${alt || "video"}](${url})`;
+          return `[${mediaLabel("video", alt)}](${url})`;
         }
         if (isExternalUrl(url)) {
           images.push({ url, isExternal: true });
@@ -7426,6 +7499,112 @@ var BlankLineCollapser = class {
   }
 };
 
+// src/converter/heading-markers.ts
+var MARKER = `%%${MARKER_BRAND_RE}:(?:block-color:[a-z_]+|toggle-heading)%%`;
+var MARKERS = `(?:${MARKER}[ \\t]*)+`;
+var HEADING_WITH_MARKERS_RE = new RegExp(`^([\\t ]*)(#{1,6}[ \\t].*?)[ \\t]+(${MARKERS})$`, "gm");
+var MARKER_LINE_AFTER_HEADING_RE = new RegExp(
+  `^([\\t ]*#{1,6}[ \\t].*?)[ \\t]*\\n[\\t ]*(${MARKERS})$`,
+  "gm"
+);
+var HEADING_LINE_RE = /^[\t ]*#{1,6}[ \t]/;
+var MARKER_LINE_RE = new RegExp(`^[\\t ]*${MARKERS}$`);
+function placeHeadingMarkersBelow(content) {
+  return mapOutsideCodeFences(
+    content,
+    (segment) => segment.replace(
+      HEADING_WITH_MARKERS_RE,
+      (_m, indent, heading, markers) => `${indent}${heading}
+${indent}${markers.trim()}`
+    )
+  );
+}
+function liftHeadingMarkers(content) {
+  return mapOutsideCodeFences(
+    content,
+    (segment) => segment.replace(
+      MARKER_LINE_AFTER_HEADING_RE,
+      (_m, heading, markers) => `${heading} ${markers.trim()}`
+    )
+  );
+}
+function isHeadingLine(line) {
+  return HEADING_LINE_RE.test(line);
+}
+function isHeadingMarkerLine(line) {
+  return MARKER_LINE_RE.test(line);
+}
+function sectionLinesWithHeadingMarkers(all, start, end) {
+  const lines = all.slice(start, end + 1);
+  const last = lines.length - 1;
+  const next = all[end + 1];
+  if (last >= 0 && next !== void 0 && isHeadingLine(lines[last]) && isHeadingMarkerLine(next)) {
+    lines[last] = `${lines[last]} ${next.trim()}`;
+  }
+  return lines;
+}
+
+// src/converter/pre-processors/heading-marker-lifter.ts
+var HeadingMarkerLifter = class {
+  name = "HeadingMarkerLifter";
+  order = 0;
+  process(input) {
+    if (input.context.direction !== "push") {
+      return { content: input.content, metadata: input.metadata };
+    }
+    return { content: liftHeadingMarkers(input.content), metadata: input.metadata };
+  }
+};
+
+// src/converter/degrade-link.ts
+function degradeLink(label, url, marker) {
+  return `[${label}](${url.replace(/\(/g, "%28").replace(/\)/g, "%29")})${marker}`;
+}
+var DEGRADE_LINK_SOURCE = "(?:\\[(?:\\\\.|[^\\\\\\]])*\\]\\([^)]*\\))?";
+function embedVaultLink(src, caption = "") {
+  const label = caption.replace(/<[^>]*>/g, "").replace(/[[\]\\]/g, "").trim();
+  return degradeLink(label === "" ? "\u{1F517} Embed" : `\u{1F517} ${label}`, src, embedMarker(src, caption));
+}
+
+// src/converter/large-file-link.ts
+var LARGE_FILE_LINK_RE = new RegExp(` ?${DEGRADE_LINK_SOURCE}${LARGE_FILE_MARKER}`, "g");
+function notionFileLocation(pageId, blockId) {
+  const page = `https://www.notion.so/${compactNotionId(pageId)}`;
+  return blockId ? `${page}#${compactNotionId(blockId)}` : page;
+}
+function fileSizeLabel(bytes) {
+  const mb = bytes / 1024 / 1024;
+  return mb >= 1 ? `${Math.round(mb)}MB` : `${Math.max(1, Math.round(bytes / 1024))}KB`;
+}
+function largeFileLink(location, bytes) {
+  return ` ${degradeLink(`\u2197 Notion \uC5D0\uC11C \uC5F4\uAE30 \xB7 ${fileSizeLabel(bytes)}`, location, LARGE_FILE_MARKER)}`;
+}
+function withLargeFileLink(content, fileLink, link) {
+  const at = content.indexOf(fileLink);
+  if (at < 0) return content;
+  const end = at + fileLink.length;
+  const sticky = new RegExp(LARGE_FILE_LINK_RE.source, "y");
+  sticky.lastIndex = end;
+  const existing = sticky.exec(content);
+  const rest = existing ? end + existing[0].length : end;
+  return `${content.slice(0, end)}${link}${content.slice(rest)}`;
+}
+function stripLargeFileLinks(content) {
+  return content.includes(LARGE_FILE_MARKER) ? content.replace(LARGE_FILE_LINK_RE, "") : content;
+}
+
+// src/converter/pre-processors/large-file-link-stripper.ts
+var LargeFileLinkStripper = class {
+  name = "LargeFileLinkStripper";
+  order = 0;
+  process(input) {
+    if (input.context.direction !== "push") {
+      return { content: input.content, metadata: input.metadata };
+    }
+    return { content: stripLargeFileLinks(input.content), metadata: input.metadata };
+  }
+};
+
 // src/utils/wikilink-title.ts
 function wikilinkTitleFromPath(obsidianPath) {
   return noteNameFromPath(obsidianPath);
@@ -7436,7 +7615,7 @@ function formatWikilink(target, label) {
 
 // src/converter/link-restore.ts
 var NOTION_LINK_REGEX = new RegExp(
-  `\\[${MARKER_LABEL_CAPTURE}\\]\\((?:https:\\/\\/(?:www\\.)?notion\\.so\\/|notion:\\/\\/)([a-f0-9-]+)\\)(?!%%${MARKER_BRAND_RE}:(?:unknown|embed):)`,
+  `\\[${MARKER_LABEL_CAPTURE}\\]\\((?:https:\\/\\/(?:www\\.)?notion\\.so\\/|notion:\\/\\/)([a-f0-9-]+)\\)(?!%%${MARKER_BRAND_RE}:(?:unknown|embed):|${LARGE_FILE_MARKER})`,
   "g"
 );
 var WIKILINK_PRESERVE_REGEX = new RegExp(
@@ -7701,7 +7880,7 @@ var PreserveMarkerInjector = class {
       const rendered = this.renderMarker(m);
       if (rendered === null) return false;
       if (content.includes(rendered)) return false;
-      return !this.isSemanticallyRestored(m, content);
+      return !this.restoredElsewhere(m);
     });
     if (missing.length === 0) {
       return { content, metadata: input.metadata };
@@ -7736,15 +7915,11 @@ var PreserveMarkerInjector = class {
     const body = entries.map(([k, v]) => `${k}=${encodeURIComponent(v)}`).join("&");
     return spacedMarker(`${marker.type}:${body}`);
   }
-  /** 마커가 이미 원래 문법으로 복원돼 있으면 재삽입은 중복·오염이다. */
-  isSemanticallyRestored(marker, content) {
-    const params = marker.params ?? {};
+  /** 다른 복원기가 맡는 마커 — 본문에 다시 끼우면 중복 · 오염이다. */
+  restoredElsewhere(marker) {
     switch (marker.type) {
-      case "wikilink": {
-        const text = params.text;
-        if (!text) return false;
-        return content.includes(`[[${text}]]`) || content.includes(`[[${text}|`);
-      }
+      case "wikilink":
+        return true;
       case "local-image":
       case "local-file":
         return true;
@@ -8604,7 +8779,10 @@ var CommentRestorer = class {
     if (input.context.direction !== "pull" || local === void 0) {
       return { content: input.content, metadata: input.metadata };
     }
-    return { content: restoreComments(input.content, local), metadata: input.metadata };
+    return {
+      content: restoreComments(input.content, liftHeadingMarkers(local)),
+      metadata: input.metadata
+    };
   }
 };
 
@@ -8953,9 +9131,10 @@ function pieces(local, pulled) {
   let j = 0;
   const zip = (to) => {
     const theirs = pulled.slice(j, to);
-    for (let k = 0; k < Math.max(pending.length, theirs.length); k++) {
-      out.push([pending.slice(k, k + 1), theirs.slice(k, k + 1)]);
-    }
+    const paired = Math.min(pending.length, theirs.length);
+    for (let k = 0; k < paired; k++) out.push([[pending[k]], [theirs[k]]]);
+    if (pending.length > paired) out.push([pending.slice(paired), []]);
+    for (let k = paired; k < theirs.length; k++) out.push([[], [theirs[k]]]);
     pending = [];
     j = to;
   };
@@ -9172,6 +9351,18 @@ function readable(note) {
   }
 }
 
+// src/converter/post-processors/heading-marker-placer.ts
+var HeadingMarkerPlacer = class {
+  name = "HeadingMarkerPlacer";
+  order = 140;
+  process(input) {
+    if (input.context.direction !== "pull") {
+      return { content: input.content, metadata: input.metadata };
+    }
+    return { content: placeHeadingMarkersBelow(input.content), metadata: input.metadata };
+  }
+};
+
 // src/converter/literal-escapes.ts
 var ASCII_PUNCT_RE = /[!-/:-@[-`{-~]/;
 var MATH_FENCE_LINE_RE = /^(?:[ \t]*>)*[ \t]*\$\$[ \t]*$/;
@@ -9752,6 +9943,8 @@ function findBodyEnd(lines, from, level) {
 // src/utils/sanitize.ts
 var INVALID_CHARS = /[<>:"/\\|?*\x00-\x1f]/g;
 var WIKILINK_UNSAFE_CHARS = /[[\]]/g;
+var LINK_SUBPATH_CHARS = /[#^]/g;
+var TRAILING_DOTS_AND_SPACES = /[.\s]+$/;
 var TRAILING_DOTS = /\.+$/;
 var RESERVED_NAMES = /* @__PURE__ */ new Set([
   "CON",
@@ -9777,15 +9970,38 @@ var RESERVED_NAMES = /* @__PURE__ */ new Set([
   "LPT8",
   "LPT9"
 ]);
-function sanitizeFileName(name) {
-  let sanitized = name.replace(INVALID_CHARS, "_").replace(WIKILINK_UNSAFE_CHARS, "_").replace(TRAILING_DOTS, "").trim().slice(0, 200);
-  if (RESERVED_NAMES.has(sanitized.toUpperCase())) {
-    sanitized = `_${sanitized}`;
-  }
-  if (sanitized.length === 0) {
-    sanitized = "_untitled";
+var FILE_NAME_MAX_BYTES = 200;
+var FILE_SYSTEM_NAME_MAX_BYTES = 255;
+var utf8 = new TextEncoder();
+function utf8Bytes(text) {
+  return utf8.encode(text).length;
+}
+function truncateBytes(name, maxBytes) {
+  if (utf8.encode(name).length <= maxBytes) return name;
+  let out = "";
+  let bytes = 0;
+  for (const { segment } of new Intl.Segmenter(void 0, { granularity: "grapheme" }).segment(
+    name
+  )) {
+    const size = utf8.encode(segment).length;
+    if (bytes + size > maxBytes) break;
+    out += segment;
+    bytes += size;
   }
-  return sanitized;
+  return out;
+}
+function guarded(name) {
+  const safe = RESERVED_NAMES.has(name.toUpperCase()) ? `_${name}` : name;
+  return safe.length === 0 ? "_untitled" : safe;
+}
+function sanitizeFileName(name) {
+  const cleaned = name.replace(INVALID_CHARS, "_").replace(WIKILINK_UNSAFE_CHARS, "_").replace(LINK_SUBPATH_CHARS, "_").trim();
+  return guarded(truncateBytes(cleaned, FILE_NAME_MAX_BYTES).replace(TRAILING_DOTS_AND_SPACES, ""));
+}
+function legacySanitizeFileName(name) {
+  return guarded(
+    name.replace(INVALID_CHARS, "_").replace(WIKILINK_UNSAFE_CHARS, "_").replace(TRAILING_DOTS, "").trim().slice(0, 200)
+  );
 }
 
 // src/converter/nfm-attrs.ts
@@ -10289,16 +10505,6 @@ function breaksToEmptyBlocks(content) {
   });
 }
 
-// src/converter/degrade-link.ts
-function degradeLink(label, url, marker) {
-  return `[${label}](${url.replace(/\(/g, "%28").replace(/\)/g, "%29")})${marker}`;
-}
-var DEGRADE_LINK_SOURCE = "(?:\\[(?:\\\\.|[^\\\\\\]])*\\]\\([^)]*\\))?";
-function embedVaultLink(src, caption = "") {
-  const label = caption.replace(/<[^>]*>/g, "").replace(/[[\]\\]/g, "").trim();
-  return degradeLink(label === "" ? "\u{1F517} Embed" : `\u{1F517} ${label}`, src, embedMarker(src, caption));
-}
-
 // src/converter/placeholder-indent.ts
 var PLACEHOLDER_LINE_RE = new RegExp(`^([ \\t]*)${MEDIA_PLACEHOLDER_HEAD}`);
 var LEADING_SPACE_RE3 = /^[ \t]*/;
@@ -11240,6 +11446,7 @@ var NOTION_AUDIO_RE = /<audio src="([^"]*)">([\s\S]*?)<\/audio>/g;
 var NOTION_VIDEO_RE = /<video src="([^"]*)">([\s\S]*?)<\/video>/g;
 var NOTION_PDF_RE = /<pdf src="([^"]*)">([\s\S]*?)<\/pdf>/g;
 var NOTION_FILE_RE = /<file src="([^"]*)">([\s\S]*?)<\/file>/g;
+var NOTION_HOSTED_EMBED_RE = /<embed\s+src="([^"]*)"[^>]*>([^\n]*?)\s*<\/embed>/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})\\)`,
@@ -11294,7 +11501,7 @@ function unescapeBrackets(content) {
   );
 }
 function obsidianToNotionEnhanced(obsidian) {
-  let result = obsidian;
+  let result = liftHeadingMarkers(stripLargeFileLinks(obsidian));
   result = quotedCodeToChildren(result);
   result = breaksToEmptyBlocks(result);
   result = pipeTablesToNfmTables(result);
@@ -11556,20 +11763,20 @@ ${indented}
 function convertMediaTags(content) {
   let result = content;
   result = result.replace(NOTION_AUDIO_RE, (_match, src, caption) => {
-    const cap = caption.trim();
-    return cap ? `[\u{1F50A} ${cap}](${src})` : `[\u{1F50A} audio](${src})`;
+    return `[${mediaLabel("audio", caption.trim())}](${src})`;
   });
   result = result.replace(NOTION_VIDEO_RE, (_match, src, caption) => {
-    const cap = caption.trim();
-    return cap ? `[\u{1F3AC} ${cap}](${src})` : `[\u{1F3AC} video](${src})`;
+    return `[${mediaLabel("video", caption.trim())}](${src})`;
   });
   result = result.replace(NOTION_PDF_RE, (_match, src, caption) => {
-    const cap = caption.trim();
-    return cap ? `[\u{1F4C4} ${cap}](${src})` : `[\u{1F4C4} pdf](${src})`;
+    return `[${mediaLabel("pdf", caption.trim())}](${src})`;
   });
   result = result.replace(NOTION_FILE_RE, (_match, src, caption) => {
-    const cap = caption.trim();
-    return cap ? `[\u{1F4CE} ${cap}](${src})` : `[\u{1F4CE} file](${src})`;
+    return `[${mediaLabel("file", caption.trim())}](${src})`;
+  });
+  result = result.replace(NOTION_HOSTED_EMBED_RE, (match, src, caption) => {
+    if (!isNotionHostedFileUrl(src)) return match;
+    return `[${mediaLabel("html", caption.trim())}](${src})`;
   });
   return result;
 }
@@ -11806,10 +12013,11 @@ $$`;
 function unescapeNotionChars(content) {
   return content.replace(/\\~/g, "~").replace(/\\\^/g, "^");
 }
-var OBSIDIAN_MEDIA_AUDIO_RE = /\[🔊\s*([^\]]*)\]\(([^)]+)\)/g;
-var OBSIDIAN_MEDIA_VIDEO_RE = /\[🎬\s*([^\]]*)\]\(([^)]+)\)/g;
-var OBSIDIAN_MEDIA_PDF_RE = /\[📄\s*([^\]]*)\]\(([^)]+)\)/g;
-var OBSIDIAN_MEDIA_FILE_RE = /\[📎\s*([^\]]*)\]\(([^)]+)\)/g;
+var OBSIDIAN_MEDIA_AUDIO_RE = mediaLinkRe("audio");
+var OBSIDIAN_MEDIA_VIDEO_RE = mediaLinkRe("video");
+var OBSIDIAN_MEDIA_PDF_RE = mediaLinkRe("pdf");
+var OBSIDIAN_MEDIA_FILE_RE = mediaLinkRe("file");
+var OBSIDIAN_MEDIA_HTML_RE = mediaLinkRe("html");
 function restoreMediaTags(content) {
   let result = content;
   const restore = (tag) => (_match, caption, src) => {
@@ -11820,6 +12028,10 @@ function restoreMediaTags(content) {
   result = result.replace(OBSIDIAN_MEDIA_VIDEO_RE, restore("video"));
   result = result.replace(OBSIDIAN_MEDIA_PDF_RE, restore("pdf"));
   result = result.replace(OBSIDIAN_MEDIA_FILE_RE, restore("file"));
+  result = result.replace(OBSIDIAN_MEDIA_HTML_RE, (_match, caption, src) => {
+    const cap = caption.trim() === "html" ? "" : caption;
+    return `<embed src="${src}">${cap}</embed>`;
+  });
   return result;
 }
 var OBSIDIAN_TAB_RE = /^> \[!tab\]\s*(.+)((?:\n> .*)*)/gm;
@@ -12090,6 +12302,8 @@ function sortKeys(value) {
 // src/converter/pipeline-factory.ts
 function createDefaultPipeline(options) {
   const pipeline = new ConversionPipeline();
+  pipeline.registerPreProcessor(new HeadingMarkerLifter());
+  pipeline.registerPreProcessor(new LargeFileLinkStripper());
   pipeline.registerPreProcessor(new InlineAnnotationPreserver());
   pipeline.registerPreProcessor(new UnsupportedBlockStripper());
   pipeline.registerPreProcessor(new CommentStripper());
@@ -12120,6 +12334,7 @@ function createDefaultPipeline(options) {
   pipeline.registerPostProcessor(
     new LocalFormRestorer((note, context, children) => sentForm(pipeline, note, context, children))
   );
+  pipeline.registerPostProcessor(new HeadingMarkerPlacer());
   return pipeline;
 }
 
@@ -12227,6 +12442,11 @@ function isNotionUploadable(path) {
   const ext = /\.[^.]+$/.exec(name)?.[0].toLowerCase();
   return ext !== void 0 && NOTION_UPLOADABLE_EXTENSIONS.has(ext);
 }
+var HTML_BLOCK_EXTENSIONS = /* @__PURE__ */ new Set([".html", ".htm"]);
+function isHtmlBlockFile(path) {
+  const ext = /\.[^./]+$/.exec(path)?.[0].toLowerCase();
+  return ext !== void 0 && HTML_BLOCK_EXTENSIONS.has(ext);
+}
 function getBlockType(filename) {
   const ext = filename.match(/\.[^.]+$/)?.[0]?.toLowerCase();
   if (!ext) return "file";
@@ -12354,10 +12574,15 @@ function toWikilinkAlias(label) {
   return label.replace(/!?\[([^\]]*)\]\(([^)]*)\)/g, "$1").replace(/\[\[([^\]|]+)(?:\|([^\]]+))?\]\]/g, (_m, t, d) => d ?? t).replace(/[\r\n]+/g, " ").replace(/\\([!-/:-@[-`{-~])/g, "$1").replace(/\]\]/g, ")").replace(/\|/g, "-").trim();
 }
 var INTERNAL_FILE_URL_RE = /^file:\/\/%7B.*%7D%7D$/;
-var FILE_LABEL_PREFIX_RE = /^(?:📎|🎬|🎞|📄|🔊)\s*/u;
-var MEDIA_TAG_RE = /<(?:file|video|audio|pdf)\s+src="([^"]+)">([\s\S]*?)<\/(?:file|video|audio|pdf)>/g;
-var MEDIA_TAG_NAME_RE = /^<(file|video|audio|pdf)\s/;
-var MEDIA_PLACEHOLDER_CAPTIONS = /* @__PURE__ */ new Set(["file", "pdf", "video", "audio"]);
+var MEDIA_TAG_NAMES = "file|video|audio|pdf|embed";
+function mediaTagRe(src) {
+  return new RegExp(
+    `<(?:${MEDIA_TAG_NAMES})\\s+src="(${src})">([\\s\\S]*?)<\\/(?:${MEDIA_TAG_NAMES})>`,
+    "g"
+  );
+}
+var MEDIA_TAG_RE = mediaTagRe('[^"]+');
+var MEDIA_TAG_NAME_RE = new RegExp(`^<(${MEDIA_TAG_NAMES})\\s`);
 var PLACEHOLDER_IMAGE_STEMS = /* @__PURE__ */ new Set(["image", "untitled"]);
 var EMBED_SIZE_RE = /^\d+(?:x\d+)?$/;
 function splitEmbedTarget(target) {
@@ -12381,8 +12606,8 @@ function embedTargetFromCaption(target, caption, uploadedName) {
   return description ? sized(`${path}|${alias}`) : `${path}|${alias}`;
 }
 function captionOfLabel(label) {
-  const caption = label.replace(FILE_LABEL_PREFIX_RE, "").replace(/\\(.)/g, "$1").trim();
-  return FILE_LABEL_PREFIX_RE.test(label) && MEDIA_PLACEHOLDER_CAPTIONS.has(caption) ? "" : caption;
+  const caption = label.replace(MEDIA_LABEL_PREFIX_RE, "").replace(/\\(.)/g, "$1").trim();
+  return MEDIA_LABEL_PREFIX_RE.test(label) && MEDIA_PLACEHOLDER_CAPTIONS.has(caption) ? "" : caption;
 }
 function fileNameOf2(caption, url) {
   return savedNameOf(caption, uploadedFileNameFromUrl(url));
@@ -12409,7 +12634,7 @@ function isNotionMediaUrl(url) {
 function notionMediaSpans(markdown) {
   const spans = [];
   for (const link of scanMarkdownLinks(markdown)) {
-    if (!link.isEmbed && !FILE_LABEL_PREFIX_RE.test(link.label)) continue;
+    if (!link.isEmbed && !MEDIA_LABEL_PREFIX_RE.test(link.label)) continue;
     if (isNotionMediaUrl(link.url)) spans.push(link);
   }
   for (const tag of markdown.matchAll(MEDIA_TAG_RE)) {
@@ -12481,6 +12706,7 @@ function mediaBlock2(kind, fileUploadId, vaultTarget, target) {
   const description = captionOfEmbed(target);
   const caption = description ? [{ type: "text", text: { content: description } }] : [];
   const file = { type: "file_upload", file_upload: { id: fileUploadId }, caption };
+  if (kind !== "image" && isHtmlBlockFile(vaultTarget)) return { type: "embed", embed: file };
   const type = kind === "image" ? "image" : getBlockType(baseName(vaultTarget));
   return type === "file" ? { type, file: { ...file, name: baseName(vaultTarget) } } : { type, [type]: file };
 }
@@ -13125,17 +13351,15 @@ var ImageHandler = class {
   }
   async downloadAllFiles(markdown, pageTitle, pageId) {
     const fileLinks = scanMarkdownLinks(markdown).filter(
-      (s) => !s.isEmbed && FILE_LABEL_PREFIX_RE.test(s.label)
+      (s) => !s.isEmbed && MEDIA_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 xmlHttpMatches = [...markdown.matchAll(mediaTagRe('https?:\\/\\/[^"]+'))];
     const notionXmlHttpMatches = xmlHttpMatches.filter((m) => m[1] && this.isNotionFileUrl(m[1]));
-    const xmlInternalRegex = /<(?:file|video|audio|pdf)\s+src="(file:\/\/%7B.*?%7D%7D)">([\s\S]*?)<\/(?:file|video|audio|pdf)>/g;
-    const xmlInternalMatches = [...markdown.matchAll(xmlInternalRegex)];
+    const xmlInternalMatches = [...markdown.matchAll(mediaTagRe("file:\\/\\/%7B.*?%7D%7D"))];
     const totalMatches = notionHttpMatches.length + mdInternalMatches.length + notionXmlHttpMatches.length + xmlInternalMatches.length;
     if (totalMatches === 0) {
       return { content: markdown, downloads: [] };
@@ -13147,9 +13371,12 @@ var ImageHandler = class {
     for (const span of notionHttpMatches) {
       await sema.acquire();
       try {
-        const caption = fileNameOf2(span.label.replace(FILE_LABEL_PREFIX_RE, ""), span.url);
+        const caption = fileNameOf2(span.label.replace(MEDIA_LABEL_PREFIX_RE, ""), span.url);
         const download = await this.downloadFile(span.url, pageTitle, caption);
-        if (!download.localPath) continue;
+        if (!download.localPath) {
+          result = keepLargeFile(result, span.full, download, pageId);
+          continue;
+        }
         downloads.push(download);
         const obsidianLink = fileEmbedOf(download.localPath, download.name ?? caption);
         result = result.replace(span.full, () => obsidianLink);
@@ -13178,9 +13405,12 @@ var ImageHandler = class {
           getLogger().warn(`[Im-Nobsidian] \uD30C\uC77C Block URL \uC870\uD68C \uC2E4\uD328: ${fileName2}`);
           continue;
         }
-        const caption = savedNameOf(span.label.replace(FILE_LABEL_PREFIX_RE, ""), fileName2);
+        const caption = savedNameOf(span.label.replace(MEDIA_LABEL_PREFIX_RE, ""), fileName2);
         const download = await this.downloadFile(realUrl, pageTitle, caption);
-        if (!download.localPath) continue;
+        if (!download.localPath) {
+          result = keepLargeFile(result, span.full, download, pageId, blockId);
+          continue;
+        }
         downloads.push(download);
         const obsidianLink = fileEmbedOf(download.localPath, download.name ?? caption);
         result = result.replace(span.full, () => obsidianLink);
@@ -13203,7 +13433,10 @@ var ImageHandler = class {
         const url = match[1];
         const caption = fileNameOf2(match[2] ?? "", url);
         const download = await this.downloadFile(url, pageTitle, caption);
-        if (!download.localPath) continue;
+        if (!download.localPath) {
+          result = keepLargeFile(result, match[0], download, pageId);
+          continue;
+        }
         downloads.push(download);
         const obsidianLink = fileEmbedOf(download.localPath, download.name ?? caption);
         result = result.replace(match[0], () => obsidianLink);
@@ -13235,7 +13468,10 @@ var ImageHandler = class {
         }
         const caption = savedNameOf(match[2] ?? "", fileName2);
         const download = await this.downloadFile(realUrl, pageTitle, caption);
-        if (!download.localPath) continue;
+        if (!download.localPath) {
+          result = keepLargeFile(result, match[0], download, pageId, blockId);
+          continue;
+        }
         downloads.push(download);
         const obsidianLink = fileEmbedOf(download.localPath, download.name ?? caption);
         result = result.replace(match[0], () => obsidianLink);
@@ -13286,18 +13522,21 @@ var ImageHandler = class {
         const contentLength = response.headers.get("content-length");
         const MAX_FILE_SIZE = this.maxFileSizeBytes;
         if (contentLength && parseInt(contentLength, 10) > MAX_FILE_SIZE) {
-          const sizeMB = Math.round(parseInt(contentLength, 10) / 1024 / 1024);
+          const bytes = parseInt(contentLength, 10);
           getLogger().info(
-            `[Im-Nobsidian] \uD30C\uC77C \uB2E4\uC6B4\uB85C\uB4DC \uAC74\uB108\uB700 \u2014 \uD06C\uAE30 \uC0C1\uD55C \uCD08\uACFC (${sizeMB}MB > ${Math.round(MAX_FILE_SIZE / 1024 / 1024)}MB), Notion \uC6D0\uBCF8 \uB9C1\uD06C \uC720\uC9C0: ${caption}`
+            `[Im-Nobsidian] \uD30C\uC77C \uB2E4\uC6B4\uB85C\uB4DC \uAC74\uB108\uB700 \u2014 \uD06C\uAE30 \uC0C1\uD55C \uCD08\uACFC (${fileSizeLabel(bytes)} > ${fileSizeLabel(MAX_FILE_SIZE)}), Notion \uC5D0\uC11C \uC5F4\uAE30 \uB9C1\uD06C\uB97C \uB460: ${caption}`
           );
-          return { originalUrl: url, localPath: "", hash: "", size: 0 };
+          return { originalUrl: url, localPath: "", hash: "", size: 0, skippedBytes: bytes };
         }
         const buffer = Buffer.from(await response.arrayBuffer());
         const fileHash = createHash("sha256").update(buffer).digest("hex");
         const hash = nameHashOf(fileHash);
         const extension = this.guessFileExtension(url, response.headers.get("content-type"));
         const name = withoutOwnHash(caption, hash);
-        const safeName = name.replace(/[^a-zA-Z0-9가-힣\s._-]/g, "").replace(/\s+/g, "-").slice(0, 80);
+        const safeName = truncateBytes(
+          name.replace(/[^a-zA-Z0-9가-힣\s._-]/g, "").replace(/\s+/g, "-").slice(0, 80),
+          FILE_SYSTEM_NAME_MAX_BYTES - utf8Bytes(`-${hash}${extension}`)
+        );
         const fileName2 = `${safeName}-${hash}${extension}`;
         const localPath = `${this.attachmentFolder}/${fileName2}`;
         await this.vaultFs.ensureFolder(this.attachmentFolder);
@@ -13359,6 +13598,11 @@ var ImageHandler = class {
     return "";
   }
 };
+function keepLargeFile(content, fileLink, download, pageId, blockId) {
+  if (download.skippedBytes === void 0 || !pageId) return content;
+  const link = largeFileLink(notionFileLocation(pageId, blockId), download.skippedBytes);
+  return withLargeFileLink(content, fileLink, link);
+}
 
 // src/view/notion-filter-translator.ts
 function translateNotionFilter(filter, schema, resolveName) {
@@ -13688,6 +13932,10 @@ function filterGroup(node) {
   return ["not", node.not];
 }
 var BASE_FILE_HEADER = "# Auto-generated by Im-Nobsidian";
+function inFolderFilter(folderPath) {
+  return `file.inFolder("${folderPath}")`;
+}
+var IN_FOLDER_FILTER_RE = /file\.inFolder\("([^"\n]*)"\)/g;
 var BaseFileGenerator = class {
   generate(options) {
     const lines = [];
@@ -13703,7 +13951,7 @@ var BaseFileGenerator = class {
   writeFilters(lines, folderPath) {
     lines.push("filters:");
     lines.push("  and:");
-    lines.push(`    - file.inFolder("${folderPath}")`);
+    lines.push(`    - ${inFolderFilter(folderPath)}`);
     lines.push(`    - file.ext == "md"`);
     lines.push("");
   }
@@ -14541,9 +14789,9 @@ function noteTitle(frontmatter, path) {
   return explicitTitle(frontmatter) ?? wikilinkTitleFromPath(path);
 }
 function isFileNameOf(title, fileName2) {
-  const safe = sanitizeFileName(title);
-  if (fileName2 === safe) return true;
-  return fileName2.startsWith(safe) && /^ \([0-9a-f]{8,32}\)$/i.test(fileName2.slice(safe.length));
+  return [sanitizeFileName(title), legacySanitizeFileName(title)].some(
+    (safe) => fileName2 === safe || fileName2.startsWith(safe) && /^ \([0-9a-f]{8,32}\)$/i.test(fileName2.slice(safe.length))
+  );
 }
 function followsFileName(title, path) {
   return isFileNameOf(title, wikilinkTitleFromPath(path));
@@ -14571,8 +14819,11 @@ function titleMayChange(base, current, from, to) {
 function extractTitle(filePath) {
   return noteNameFromPath(filePath);
 }
-function titleProperty(title) {
-  return { title: { title: [{ text: { content: title } }] } };
+function titleProperty(title, remote) {
+  const runs = remote ? titleRunsOf(remote) : null;
+  return {
+    title: { title: (runs && patchRichText(runs, title)) ?? [{ text: { content: title } }] }
+  };
 }
 function extractAliases(properties) {
   const raw = properties.aliases ?? properties.alias;
@@ -14599,10 +14850,14 @@ function selectDbRowFiles(files, localFolder) {
     return rel.length > 0 && !rel.includes("/");
   });
 }
+var PAGE_ID_SUFFIX_LENGTHS = [8, 16, 32];
 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`)];
+  return [
+    `${base}.md`,
+    ...PAGE_ID_SUFFIX_LENGTHS.map((len) => `${base} (${raw.slice(0, len)}).md`)
+  ];
 }
 function resolveDbRowPath(localFolder, safeName, pageId, lookupByPath) {
   const ownedBySelf = (candidate) => {
@@ -14613,9 +14868,9 @@ function resolveDbRowPath(localFolder, safeName, pageId, lookupByPath) {
   const candidates = pagePathCandidates(localFolder, safeName, pageId);
   return candidates.find(ownedBySelf) ?? candidates[candidates.length - 1];
 }
-function inClaimOrder(items, chosen, idOf) {
+function inClaimOrder(items, chosen, idOf2) {
   const slots = items.flatMap((item, index) => chosen(item) ? [index] : []);
-  const key = (item) => compactNotionId(idOf(item));
+  const key = (item) => compactNotionId(idOf2(item));
   const members = slots.map((index) => items[index]).sort((a, b) => key(a) < key(b) ? -1 : key(a) > key(b) ? 1 : 0);
   const ordered = [...items];
   slots.forEach((slot, k) => ordered[slot] = members[k]);
@@ -14979,8 +15234,14 @@ var DbBaseFiles = class {
     const entries = this.load();
     const key = compactNotionId(databaseId);
     const known = entries.get(key);
-    if (known?.basePath === info.basePath && known.title === info.title) return;
-    entries.set(key, { basePath: info.basePath, title: info.title });
+    if (known?.basePath === info.basePath && known.title === info.title && known.hash === info.hash) {
+      return;
+    }
+    entries.set(key, {
+      basePath: info.basePath,
+      title: info.title,
+      ...info.hash ? { hash: info.hash } : {}
+    });
     this.loadedRaw = JSON.stringify(Object.fromEntries(entries));
     this.stateDb.setMeta(DB_BASE_FILES_META_KEY, this.loadedRaw);
   }
@@ -14997,7 +15258,11 @@ var DbBaseFiles = class {
       for (const [key, value] of Object.entries(parsed)) {
         const entry = value;
         if (typeof entry?.basePath === "string" && typeof entry.title === "string") {
-          this.entries.set(compactNotionId(key), { basePath: entry.basePath, title: entry.title });
+          this.entries.set(compactNotionId(key), {
+            basePath: entry.basePath,
+            title: entry.title,
+            ...typeof entry.hash === "string" ? { hash: entry.hash } : {}
+          });
         }
       }
     } catch {
@@ -15082,9 +15347,9 @@ async function retargetBaseFiles(vaultFs, moves) {
       if (!file.path.endsWith(BASE_SUFFIX)) continue;
       const content = await vaultFs.readFile(file.path);
       if (!isGeneratedDbArtifact(file.path, content)) continue;
-      const next = content.replace(IN_FOLDER, (whole, folder) => {
+      const next = content.replace(IN_FOLDER_FILTER_RE, (whole, folder) => {
         const to = finalPath(folder, folders);
-        return to === folder ? whole : `file.inFolder("${to}")`;
+        return to === folder ? whole : inFolderFilter(to);
       });
       if (next !== content) await vaultFs.writeFile(file.path, next);
     }
@@ -15094,7 +15359,6 @@ async function retargetBaseFiles(vaultFs, moves) {
     );
   }
 }
-var IN_FOLDER = /file\.inFolder\("([^"\n]*)"\)/g;
 function finalPath(path, moves) {
   let current = path;
   for (const move of moves) {
@@ -15660,7 +15924,7 @@ var DatabaseSyncer = class {
    */
   appearances = /* @__PURE__ */ new WeakMap();
   baseFileGenerator = new BaseFileGenerator();
-  /** 사용자가 만든 `.base` 라 덮어쓰지 않았다고 이미 알린 경로 — 한 pull 이 같은 DB 를 여러 번 다시 쓴다. */
+  /** 사용자가 만들거나 고친 `.base` 라 덮어쓰지 않았다고 이미 알린 경로 — 한 pull 이 같은 DB 를 여러 번 다시 쓴다. */
   keptUserBases = /* @__PURE__ */ new Set();
   sidecarGenerator = new SidecarGenerator();
   /** Notion 에서 바꾼 제목으로 이름을 바꾼 행과 실제로 옮긴 차례 — pull 마감이 가져가 다른 노트의 링크를 고친다. */
@@ -15669,6 +15933,8 @@ var DatabaseSyncer = class {
     renamed: [],
     applied: []
   };
+  /** 볼트에서 사라져 되살린 행의 경로 — pull 마감이 가져가 화면에 알린다(D8). */
+  restoredRows = [];
   /**
    * 실제로 기록한 .base 경로/DB 제목 — placeholder 임베드 재작성(F22)의 SSOT. 이번 pull 이 조회하지
    * 않은 DB 의 것도 남아 있다({@link DbBaseFiles}).
@@ -15786,8 +16052,10 @@ var DatabaseSyncer = class {
           created++;
           if (outcome.action === "written") writtenPaths.push(outcome.path);
         } else if (outcome.action === "written") {
-          if (action === "restore") restored++;
-          else updated++;
+          if (action === "restore") {
+            restored++;
+            this.restoredRows.push(outcome.path);
+          } else updated++;
           writtenPaths.push(outcome.path);
         } else if (outcome.action === "conflict") {
           conflicts.push(outcome.conflict);
@@ -16136,17 +16404,23 @@ var DatabaseSyncer = class {
       });
       const safeName = sanitizeFileName(dbName);
       const basePath = `${dbConfig.localFolder}/${safeName}${BASE_SUFFIX}`;
-      if (await this.isUserFile(basePath)) {
+      const previous = this.baseFileInfo.get(dbConfig.databaseId);
+      const existing = await this.vaultFs.readFile(basePath).catch(() => null);
+      let hash = computeHash(baseContent);
+      if (existing !== null && !isGeneratedDbArtifact(basePath, existing)) {
         if (!this.keptUserBases.has(basePath)) {
           this.keptUserBases.add(basePath);
           getLogger().info(
             `[DB Sync] \uC9C1\uC811 \uB9CC\uB4E0 .base \uB77C Notion \uBCF4\uAE30\uB85C \uB36E\uC5B4\uC4F0\uC9C0 \uC54A\uC74C: ${basePath} \u2014 Notion \uBCF4\uAE30\uB97C \uBC1B\uC73C\uB824\uBA74 \uC774 \uD30C\uC77C\uC758 \uC774\uB984\uC744 \uBC14\uAFB8\uC138\uC694`
           );
         }
-      } else {
+      } else if (existing !== null && existing !== baseContent && editedSince(previous, basePath, existing)) {
+        hash = previous.hash;
+        this.warnEditedBase(basePath);
+      } else if (existing !== baseContent) {
         await this.vaultFs.writeFile(basePath, baseContent);
       }
-      this.baseFileInfo.set(dbConfig.databaseId, { basePath, title: dbName });
+      this.baseFileInfo.set(dbConfig.databaseId, { basePath, title: dbName, hash });
       getLogger().debug(`[DB Sync] .base \uD30C\uC77C \uC0DD\uC131: ${basePath}`);
       await this.generateSidecar(
         dbConfig,
@@ -16157,7 +16431,7 @@ var DatabaseSyncer = class {
         meta.isInline,
         await this.appearanceOf(meta, safeName)
       );
-      await this.cleanupStaleDbArtifacts(dbConfig.localFolder, safeName);
+      await this.cleanupStaleDbArtifacts(dbConfig.localFolder, safeName, previous);
     } catch (error) {
       getLogger().warn(`[DB Sync] .base \uD30C\uC77C \uC0DD\uC131 \uC2E4\uD328 (\uACC4\uC18D \uC9C4\uD589):`, error);
     }
@@ -16189,17 +16463,20 @@ var DatabaseSyncer = class {
       ...a.showTitle ? {} : { showTitle: false }
     };
   }
-  /** pull 이 쓰지 않은 `.base` · 사이드카가 이미 있는가 — 없거나 읽지 못하면 false. */
-  async isUserFile(path) {
-    const content = await this.vaultFs.readFile(path).catch(() => null);
-    return content !== null && !isGeneratedDbArtifact(path, content);
+  /** 볼트에서 고친 `.base` 를 덮어쓰거나 지우지 않았다고 한 번 알린다. */
+  warnEditedBase(path) {
+    if (this.keptUserBases.has(path)) return;
+    this.keptUserBases.add(path);
+    getLogger().warn(
+      `[DB Sync] \uBCFC\uD2B8\uC5D0\uC11C \uACE0\uCE5C .base \uB77C Notion \uBCF4\uAE30\uB85C \uB36E\uC5B4\uC4F0\uC9C0 \uC54A\uC74C: ${path} \u2014 Notion \uC758 \uBCF4\uAE30\uB97C \uB2E4\uC2DC \uBC1B\uC73C\uB824\uBA74 \uC774 \uD30C\uC77C\uC744 \uC9C0\uC6B0\uC138\uC694`
+    );
   }
   /**
    * DB 제목이 바뀌면 `.base`/`.notion.json` 파일명(safeName)이 바뀌어 옛 이름의 산출물이
    * 같은 폴더에 고아로 잔존한다(drift·부활 원인). DB 폴더 **직속**의 산출물 중 현재 이름이
    * 아닌 것을 삭제해 멱등을 보장한다. 하위 폴더(중첩 DB)의 산출물은 보호한다.
    */
-  async cleanupStaleDbArtifacts(localFolder, safeName) {
+  async cleanupStaleDbArtifacts(localFolder, safeName, previous) {
     try {
       const keep = /* @__PURE__ */ new Set([
         `${localFolder}/${safeName}${BASE_SUFFIX}`,
@@ -16208,7 +16485,12 @@ var DatabaseSyncer = class {
       const files = await this.vaultFs.listNonMarkdownFiles();
       const stale = selectStaleDbArtifacts(files, localFolder, keep);
       for (const path of stale) {
-        if (await this.isUserFile(path)) continue;
+        const content = await this.vaultFs.readFile(path).catch(() => null);
+        if (content === null || !isGeneratedDbArtifact(path, content)) continue;
+        if (editedSince(previous, path, content)) {
+          this.warnEditedBase(path);
+          continue;
+        }
         await this.vaultFs.deleteFile(path);
         getLogger().info(`[DB Sync] \uACE0\uC544 DB \uC0B0\uCD9C\uBB3C \uC0AD\uC81C(rename): ${path}`);
       }
@@ -16386,6 +16668,12 @@ var DatabaseSyncer = class {
     }
     return (path) => this.stateDb.getByPath(path) ?? (untracked.has(path) ? { notionPageId: null } : null);
   }
+  /** 되살린 행의 경로를 가져가고 비운다. */
+  takeRestoredRows() {
+    const rows = this.restoredRows;
+    this.restoredRows = [];
+    return rows;
+  }
   /** 이름을 바꾼 행을 가져가고 비운다. */
   takeRenamedRows() {
     const rows = this.renamedRows;
@@ -16558,6 +16846,9 @@ var DatabaseSyncer = class {
 function rowProperties(page) {
   return page.properties ?? {};
 }
+function editedSince(previous, path, content) {
+  return previous?.basePath === path && previous.hash !== void 0 && computeHash(content) !== previous.hash;
+}
 
 // src/audit/completeness.ts
 function groupLocalRowsByDatabase(local) {
@@ -16654,6 +16945,40 @@ async function verifyPageCompleteness(remote, local, rootPageId) {
   };
 }
 
+// src/audit/nested-folder-pages.ts
+var ID_SUFFIX = new RegExp(
+  ` \\((?:${PAGE_ID_SUFFIX_LENGTHS.map((len) => `[0-9a-f]{${len}}`).join("|")})\\)$`
+);
+function folderOf3(record) {
+  if (record.fileType === "db-row") return null;
+  if (isFolderRecord(record)) return record.obsidianPath;
+  const slash = record.obsidianPath.lastIndexOf("/");
+  if (slash < 0) return null;
+  const folder = record.obsidianPath.slice(0, slash);
+  const stem = stripMarkdownExtension(record.obsidianPath.slice(slash + 1)).replace(ID_SUFFIX, "");
+  return stem === folder.slice(folder.lastIndexOf("/") + 1) ? folder : null;
+}
+function findNestedFolderPages(records) {
+  const byPage = /* @__PURE__ */ new Map();
+  for (const record of records) {
+    if (record.notionPageId !== null) byPage.set(compactNotionId(record.notionPageId), record);
+  }
+  const found2 = [];
+  for (const inner of records) {
+    if (inner.notionPageId === null || inner.notionParentId === null) continue;
+    const folder = folderOf3(inner);
+    if (folder === null) continue;
+    const outer = byPage.get(compactNotionId(inner.notionParentId));
+    if (!outer || outer === inner || folderOf3(outer) !== folder) continue;
+    found2.push({
+      folder,
+      outer: { path: outer.obsidianPath, notionPageId: outer.notionPageId },
+      inner: { path: inner.obsidianPath, notionPageId: inner.notionPageId }
+    });
+  }
+  return found2.sort((a, b) => a.folder < b.folder ? -1 : a.folder > b.folder ? 1 : 0);
+}
+
 // src/conflict/merger.ts
 function threeWayMerge(base, local, remote) {
   const baseLines = base.split("\n");
@@ -17068,6 +17393,9 @@ var ScopedVaultFS = class {
   async ensureFolder(path) {
     return await this.base.ensureFolder(this.toBase(path, true));
   }
+  async removeEmptyFolder(path) {
+    return await this.base.removeEmptyFolder?.(this.toBase(path, true)) ?? false;
+  }
   /** 맡은 노트만 읽는다 — 볼트 전체의 본문을 읽지 않는다. */
   async listMarkdownFiles() {
     const stats = await this.listMarkdownFileStats();
@@ -17145,7 +17473,7 @@ function nextFullReconcileAt(lastFullPullAt, intervalSec) {
   const last = lastFullPullAt === null ? NaN : Date.parse(lastFullPullAt);
   return Number.isFinite(last) ? new Date(last + intervalSec * 1e3).toISOString() : null;
 }
-function remoteScanInfo(scan, lastFullPullAt, deleteSync) {
+function remoteScanInfo(scan, lastFullPullAt, deleteSync, deletionsChecked = false) {
   return scan.kind === "full" ? {
     kind: "full",
     reason: scan.reason,
@@ -17156,7 +17484,7 @@ function remoteScanInfo(scan, lastFullPullAt, deleteSync) {
     kind: "incremental",
     lastFullAt: scan.lastFullAt,
     nextFullAt: scan.nextFullAt,
-    deletionsDeferred: deleteSync
+    deletionsDeferred: deleteSync && !deletionsChecked
   };
 }
 var ALL_DATABASES = { kind: "all" };
@@ -17178,6 +17506,14 @@ function parsePendingDatabases(raw) {
 function serializePendingDatabases(ids) {
   return JSON.stringify([...ids].sort());
 }
+function addPendingDatabases(stateDb, databaseIds) {
+  const pending = parsePendingDatabases(stateDb.getMeta(PENDING_DATABASES_META_KEY));
+  const before = pending.size;
+  for (const id of databaseIds) pending.add(compactNotionId(id));
+  if (pending.size !== before) {
+    stateDb.setMeta(PENDING_DATABASES_META_KEY, serializePendingDatabases(pending));
+  }
+}
 var DatabasePullLedger = class {
   constructor(selection, pending) {
     this.selection = selection;
@@ -17539,8 +17875,7 @@ var InterruptedSyncRecovery = class {
         if (isNotionObjectNotFound(error)) continue;
         throw error;
       }
-      const inTrash = page.in_trash === true;
-      if (inTrash || page.archived) continue;
+      if (isTrashedOrArchived(page)) continue;
       return page;
     }
     return null;
@@ -17559,8 +17894,7 @@ var InterruptedSyncRecovery = class {
     });
     for (const row of rows) {
       if (this.stateDb.getByNotionId(row.id)) continue;
-      const inTrash = row.in_trash === true;
-      if (inTrash || row.archived) continue;
+      if (isTrashedOrArchived(row)) continue;
       return row;
     }
     return null;
@@ -18059,7 +18393,7 @@ var DatabaseDiscovery = class {
     }
     let safeName;
     if (dbTitle) {
-      safeName = dbTitle.replace(/[^a-zA-Z0-9가-힣\s_-]/g, "").replace(/\s+/g, "-");
+      safeName = databaseFolderName(dbTitle);
     } else {
       const parentName = parentFolder.split("/").pop() || "";
       safeName = parentName ? `${parentName}-DB` : `db-${dbId.replace(/-/g, "").slice(0, 8)}`;
@@ -18152,6 +18486,12 @@ var DatabaseDiscovery = class {
     return refs;
   }
 };
+function databaseFolderName(title) {
+  return truncateBytes(
+    title.replace(/[^a-zA-Z0-9가-힣\s_-]/g, "").replace(/\s+/g, "-"),
+    FILE_SYSTEM_NAME_MAX_BYTES
+  );
+}
 
 // src/sync/folder-placement.ts
 var FolderPlacement = class {
@@ -18975,7 +19315,7 @@ var RemoteRenameFollower = class {
   /** 바꿀 것이 없으면 null. */
   async followOne(record, dryRun) {
     const page = await this.pageOf(record.notionPageId);
-    if (page.in_trash || page.archived) return null;
+    if (isTrashedOrArchived(page)) return null;
     const title = this.notionClient.extractTitle(page);
     if (!retitledInNotion(...await this.frontmatters(record), record.obsidianPath, title)) {
       return null;
@@ -19116,7 +19456,7 @@ function rewriteTarget(target, source, context, kind) {
   const shown = keepExtension ? destination : destination.slice(0, -".md".length);
   let next;
   if (resolved.relative) {
-    next = relativePath(folderOf3(source.to), shown);
+    next = relativePath(folderOf4(source.to), shown);
     if (!linkpath.startsWith("./") && next.startsWith("./")) next = next.slice(2);
   } else if (style === "name") {
     const name = baseName3(shown);
@@ -19138,14 +19478,14 @@ function resolveLinkpath(linkpath, sourcePath, files) {
     const matches = byName(files, baseName3(candidate)).filter((file) => file.endsWith(suffix));
     if (matches.length === 1) return found(matches[0], linkpath);
     if (matches.length > 1) {
-      const local = `${folderPrefix(folderOf3(sourcePath))}${candidate}`;
+      const local = `${folderPrefix(folderOf4(sourcePath))}${candidate}`;
       return matches.includes(local) ? found(local, linkpath) : null;
     }
   }
   return null;
 }
 function resolveRelative(linkpath, sourcePath, files) {
-  const joined = normalizeSegments(`${folderPrefix(folderOf3(sourcePath))}${linkpath}`);
+  const joined = normalizeSegments(`${folderPrefix(folderOf4(sourcePath))}${linkpath}`);
   if (joined === null) return null;
   for (const candidate of withExtension(joined)) {
     if (files.has(candidate)) return { ...found(candidate, linkpath), relative: true };
@@ -19204,7 +19544,7 @@ function relativePath(from, to) {
 function encodeMarkdownTarget(next, original) {
   return original.includes("%") || next.includes(" ") ? next.replace(/ /g, "%20") : next;
 }
-function folderOf3(path) {
+function folderOf4(path) {
   const slash = path.lastIndexOf("/");
   return slash === -1 ? "" : path.slice(0, slash);
 }
@@ -20473,9 +20813,7 @@ var DatabaseCreator = class {
       discovered.push({ databaseId, localFolder: folder, titleProperty: titleProperty2 });
       this.stateDb.setMeta(DISCOVERED_DBS_META_KEY, JSON.stringify(discovered));
     }
-    const pending = parsePendingDatabases(this.stateDb.getMeta(PENDING_DATABASES_META_KEY));
-    pending.add(compactNotionId(databaseId));
-    this.stateDb.setMeta(PENDING_DATABASES_META_KEY, serializePendingDatabases(pending));
+    addPendingDatabases(this.stateDb, [databaseId]);
   }
   async readSidecar(path) {
     try {
@@ -20780,6 +21118,7 @@ var PagePusher = class {
    * (ADR-017). relation 을 보내면 가리킨 행의 반대쪽 relation 이, 행을 만들면 그 행의 수식 · ID 가 바뀐다.
    */
   markRemoteUnverified(pageIds) {
+    const databases = [];
     for (const pageId of new Set(pageIds)) {
       const target = this.stateDb.getByNotionId(pageId);
       if (!target?.notionLastEdited) continue;
@@ -20788,6 +21127,76 @@ var PagePusher = class {
         lastEditedBy: null,
         seenAt: null
       });
+      if (target.fileType === "db-row" && target.notionParentId) {
+        databases.push(target.notionParentId);
+      }
+    }
+    addPendingDatabases(this.stateDb, databases);
+  }
+  /** 이번 실행에서 볼트의 값을 올리지 않은 읽기 전용 속성 — 노트 경로별. */
+  readOnlySkips = /* @__PURE__ */ new Map();
+  /** 올리지 않은 읽기 전용 속성을 꺼낸다(목록은 비운다). */
+  takeReadOnlySkips() {
+    const skips = [...this.readOnlySkips].sort(([a], [b]) => a.localeCompare(b)).map(([path, properties]) => ({ path, properties }));
+    this.readOnlySkips.clear();
+    return skips;
+  }
+  /**
+   * dry-run 이 알릴 읽기 전용 속성 — 실제 push 처럼 볼트에서 바꾼 행 속성(새 행은 모든 속성) 가운데 Notion 이 값을
+   * 정하는 것. 원격은 읽지 않고 지난 동기화 사본과 견준다 — 원격도 바뀌었으면 실제 push 와 다를 수 있다. 사본이
+   * 없거나 frontmatter · 스키마를 읽지 못하면 그 노트는 건너뛴다(실제 push 가 이유와 함께 알린다).
+   */
+  async previewReadOnlySkips(changes) {
+    const skips = [];
+    for (const change of changes) {
+      const row = this.previewRow(change);
+      if (!row) continue;
+      try {
+        const current = parseFrontmatter(await this.vaultFs.readFile(change.path));
+        const { changed, cleared } = diffRowProperties(row.base, current.data);
+        const mapper = await this.rowSchemas.mapperFor(row.databaseId);
+        const readOnly = mapper.readOnlyKeys(
+          withoutDecorations([...Object.keys(changed), ...cleared])
+        );
+        if (readOnly.length > 0) skips.push({ path: change.path, properties: readOnly });
+      } catch {
+        continue;
+      }
+    }
+    return skips.sort((a, b) => a.path.localeCompare(b.path));
+  }
+  /** dry-run 이 견줄 행 — 새 행은 기준 없이, 고친 행은 지난 동기화 사본과. 행이 아니거나 사본이 없으면 null. */
+  previewRow(change) {
+    if (change.type === "created") {
+      const databaseId2 = this.placement.newRowDatabaseOf(change.path);
+      return databaseId2 ? { databaseId: databaseId2, base: null } : null;
+    }
+    if (change.type !== "modified") return null;
+    const record = this.stateDb.getByPath(change.path);
+    const databaseId = record ? rowDatabaseOf(this.config, record) : null;
+    const base = record && databaseId ? this.baseRowState(record) : null;
+    return databaseId && base ? { databaseId, base: base.properties } : null;
+  }
+  /**
+   * 보내지 않은 속성을 알린다. 읽기 전용 속성은 경고로 따로 모은다 — 다음 pull 이 볼트의 값을 Notion 값으로 되돌리니
+   * 고친 사람이 알아야 한다. 나머지(DB 에 없는 속성 · 변환 불가 …)는 예전처럼 정보 로그다.
+   */
+  reportUnsent(path, mapper, skipped, what) {
+    const unsent = withoutDecorations(skipped);
+    const readOnly = mapper.readOnlyKeys(unsent);
+    if (readOnly.length > 0) {
+      this.readOnlySkips.set(path, readOnly);
+      getLogger().warn(
+        `[Im-Nobsidian] \uC77D\uAE30 \uC804\uC6A9 \uC18D\uC131 ${readOnly.length}\uAC1C\uB294 Notion \uC774 \uAC12\uC744 \uC815\uD574 \uC62C\uB9AC\uC9C0 \uC54A\uC74C \u2014 \uB2E4\uC74C pull \uC774 Notion \uAC12\uC73C\uB85C \uB418\uB3CC\uB9B0\uB2E4: ${path} \u2014 ${readOnly.join(", ")}`
+      );
+    } else {
+      this.readOnlySkips.delete(path);
+    }
+    const others = unsent.filter((key) => !readOnly.includes(key));
+    if (others.length > 0) {
+      getLogger().info(
+        `[Im-Nobsidian] ${what} ${others.length}\uAC1C\uB294 \uBCF4\uB0B4\uC9C0 \uC54A\uC74C(DB \uC5D0 \uC5C6\uB294 \uC18D\uC131 \xB7 \uBE44\uC6B8 \uC218 \uC5C6\uB294 \uC18D\uC131 \xB7 \uBCC0\uD658 \uBD88\uAC00): ${path} \u2014 ${others.join(", ")}`
+      );
     }
   }
   /** relation 을 보내지 못한 행을 꺼낸다(목록은 비운다). */
@@ -20812,7 +21221,7 @@ var PagePusher = class {
     const selectedPath = this.pipeline.selectPath(content);
     if (selectedPath === "block-api") {
       getLogger().warn(
-        `[Im-Nobsidian] "${path}" contains block-api features (inline-db/column/toggle) \u2014 converted with reduced fidelity in v0.1.0`
+        `[Im-Nobsidian] "${path}" contains block-api features (inline-db/column) \u2014 converted with reduced fidelity in v0.1.0`
       );
     }
     const conversionResult = this.pipeline.convertToNotion(content, {
@@ -20956,7 +21365,7 @@ var PagePusher = class {
     const updatePath = this.pipeline.selectPath(content);
     if (updatePath === "block-api") {
       getLogger().warn(
-        `[Im-Nobsidian] "${path}" contains block-api features (inline-db/column/toggle) \u2014 converted with reduced fidelity in v0.1.0`
+        `[Im-Nobsidian] "${path}" contains block-api features (inline-db/column) \u2014 converted with reduced fidelity in v0.1.0`
       );
     }
     const conversionResult = this.pipeline.convertToNotion(content, {
@@ -20987,7 +21396,7 @@ var PagePusher = class {
       bodyFingerprint = await this.drift.remoteBodyFingerprintOf(record.notionPageId);
     }
     const newTitle = this.changedPageTitle(record, content, path);
-    const propsToUpdate = newTitle === null ? void 0 : titleProperty(newTitle);
+    const propsToUpdate = newTitle === null ? void 0 : titleProperty(newTitle, pagePropertiesOf(remote));
     const decorated = await this.decorations.push(
       record.notionPageId,
       path,
@@ -21170,16 +21579,11 @@ var PagePusher = class {
       current: current.data,
       uploads: await this.uploadsFor(mapper, changes.changed, path)
     });
-    const unsentProperties = withoutDecorations(skipped);
-    if (unsentProperties.length > 0) {
-      getLogger().info(
-        `[Im-Nobsidian] \uC0C8 \uD589 \uC18D\uC131 ${unsentProperties.length}\uAC1C\uB294 \uBCF4\uB0B4\uC9C0 \uC54A\uC74C(DB \uC5D0 \uC5C6\uB294 \uC18D\uC131 \xB7 \uC77D\uAE30 \uC804\uC6A9 \xB7 \uBCC0\uD658 \uBD88\uAC00): ${path} \u2014 ${unsentProperties.join(", ")}`
-      );
-    }
+    this.reportUnsent(path, mapper, skipped, "\uC0C8 \uD589 \uC18D\uC131");
     const selectedPath = this.pipeline.selectPath(content);
     if (selectedPath === "block-api") {
       getLogger().warn(
-        `[Im-Nobsidian] "${path}" contains block-api features (inline-db/column/toggle) \u2014 converted with reduced fidelity in v0.1.0`
+        `[Im-Nobsidian] "${path}" contains block-api features (inline-db/column) \u2014 converted with reduced fidelity in v0.1.0`
       );
     }
     const conversionResult = this.pipeline.convertToNotion(content, {
@@ -21378,12 +21782,7 @@ var PagePusher = class {
         ...against === null || options.overwriteRemote ? {} : { uploads: await this.uploadsFor(mapper, changes.changed, path) }
       }
     );
-    const unsentProperties = withoutDecorations(skipped);
-    if (unsentProperties.length > 0) {
-      getLogger().info(
-        `[Im-Nobsidian] \uD589 \uC18D\uC131 ${unsentProperties.length}\uAC1C\uB294 \uBCF4\uB0B4\uC9C0 \uC54A\uC74C(DB \uC5D0 \uC5C6\uB294 \uC18D\uC131 \xB7 \uC77D\uAE30 \uC804\uC6A9 \xB7 \uBE44\uC6B8 \uC218 \uC5C6\uB294 \uC18D\uC131 \xB7 \uBCC0\uD658 \uBD88\uAC00): ${path} \u2014 ${unsentProperties.join(", ")}`
-      );
-    }
+    this.reportUnsent(path, mapper, skipped, "\uD589 \uC18D\uC131");
     const bodyChanged = against?.body == null || against.body !== current.body;
     const settles = drift === "none";
     if (bodyChanged && !this.drift.overwritesRemote(record, options.overwriteRemote)) {
@@ -21395,7 +21794,7 @@ var PagePusher = class {
       const selectedPath = this.pipeline.selectPath(content);
       if (selectedPath === "block-api") {
         getLogger().warn(
-          `[Im-Nobsidian] "${path}" contains block-api features (inline-db/column/toggle) \u2014 converted with reduced fidelity in v0.1.0`
+          `[Im-Nobsidian] "${path}" contains block-api features (inline-db/column) \u2014 converted with reduced fidelity in v0.1.0`
         );
       }
       conversionResult = this.pipeline.convertToNotion(content, {
@@ -21473,6 +21872,8 @@ var PagePusher = class {
         aliases: extractAliases(current.data)
       });
     });
+    if (mapper.readOnlyKeys(withoutDecorations(skipped)).length > 0)
+      this.markRemoteUnverified([pageId]);
   }
   /**
    * 지난 동기화 시점의 행. 사본이 없거나 읽지 못하면 null — 호출측은 비교할 기준이 없다고
@@ -21517,7 +21918,10 @@ var PagePusher = class {
       const title = change.title ? change.title(this.notionClient.extractTitle(remote)) : null;
       if (newParent !== null) await this.notionClient.movePage(pageId, newParent);
       if (title !== null) {
-        written = await this.notionClient.updatePageProperties(pageId, titleProperty(title));
+        written = await this.notionClient.updatePageProperties(
+          pageId,
+          titleProperty(title, pagePropertiesOf(remote))
+        );
       } else if (newParent !== null) {
         written = await this.notionClient.getPage(pageId);
       }
@@ -21863,6 +22267,8 @@ var PagePuller = class {
   // 제목이 같은 새 페이지끼리 경로를 고르는 차례({@link orderCreates}) — 페이지 → 앞 차례가 경로를 고르면
   // 풀리는 약속과 내 차례를 끝내는 함수.
   claimTurns = /* @__PURE__ */ new Map();
+  // Notion 에서 사라져 볼트에서 지운 페이지의 하위 폴더 — pull 이 마칠 때 비었으면 지운다({@link removeVacatedFolders}).
+  vacatedFolders = /* @__PURE__ */ new Set();
   decorationsCache;
   get decorations() {
     return this.decorationsCache ??= new PageDecorations(this.notionClient, this.imageHandler);
@@ -21877,6 +22283,35 @@ var PagePuller = class {
     this.claimTurns.clear();
     this._pullImageCount = 0;
     this._pullFileCount = 0;
+    this.vacatedFolders.clear();
+  }
+  /**
+   * 이번 pull 이 지운 페이지의 폴더가 비었으면 지운다 — 안쪽부터, 그래야 바깥이 빈다. 예전에는 노트만 지우고
+   * 폴더를 남겨 볼트에 빈 폴더가 쌓였다. 사용자 파일 · 숨김 파일이 하나라도 남은 폴더는 둔다
+   * ({@link VaultFS.removeEmptyFolder}).
+   */
+  async removeVacatedFolders() {
+    const folders = [...this.vacatedFolders].sort(
+      (a, b) => b.split("/").length - a.split("/").length
+    );
+    this.vacatedFolders.clear();
+    for (const folder of folders) {
+      try {
+        await this.vaultFs.removeEmptyFolder?.(folder);
+      } catch (error) {
+        getLogger().warn(`[Im-Nobsidian] \uBE48 \uD3F4\uB354 ${folder} \uB97C \uC9C0\uC6B0\uC9C0 \uBABB\uD568:`, error);
+      }
+    }
+  }
+  /**
+   * 원격에서 사라진 페이지의 하위 폴더를 적어 둔다 — 그 아래 페이지도 함께 사라졌으면 pull 끝에 빈다. 볼트 맨 위와
+   * DB 폴더는 적지 않는다 — DB 는 페이지가 아니다.
+   */
+  noteVacatedFolder(record) {
+    const lookup = this.placement.folderLookup();
+    if (isFolderRecord(record) && lookup.databaseAt(record.obsidianPath)) return;
+    const folder = childFolderOf(record, lookup);
+    if (folder !== "" && !lookup.databaseAt(folder)) this.vacatedFolders.add(folder);
   }
   /** 이번 pull 이 내려받은 이미지 수. */
   get imageCount() {
@@ -22056,7 +22491,7 @@ var PagePuller = class {
       if (!folderNote) return { action: "unchanged", path: record.obsidianPath };
       record = folderNote;
     }
-    const remoteGone = page.in_trash === true || page.archived === true;
+    const remoteGone = isTrashedOrArchived(page);
     if (remoteGone && !await this.vaultFs.exists(record.obsidianPath)) {
       return { action: "unchanged", path: record.obsidianPath };
     }
@@ -22152,6 +22587,7 @@ var PagePuller = class {
         this.stateDb.delete(record.id);
         this.stateDb.deleteWikilink(record.obsidianPath);
       });
+      if (this.config.sync.deleteSync) this.noteVacatedFolder(record);
       return { action: "untracked", path: record.obsidianPath };
     }
     const outcome = await applyRemoteDeletion(this.stateDb, this.vaultFs, record, {
@@ -22159,6 +22595,7 @@ var PagePuller = class {
       strategy: this.config.sync.conflictStrategy,
       remoteChange: change
     });
+    if (outcome.action === "deleted" && this.config.sync.deleteSync) this.noteVacatedFolder(record);
     return { ...outcome, path: record.obsidianPath };
   }
   /**
@@ -22314,8 +22751,7 @@ var PagePuller = class {
    */
   async pullFolderRecord(record, page) {
     const folder = record.obsidianPath;
-    const remoteGone = page.in_trash === true || page.archived === true;
-    if (remoteGone) return null;
+    if (isTrashedOrArchived(page)) return null;
     const { markdown } = await this.notionClient.getPageMarkdown(page.id);
     if (!hasBodyBesidesChildren(markdown)) {
       this.observation.record(record.id, page, remoteBodyFingerprint(markdown));
@@ -22647,6 +23083,13 @@ var PullPlanner = class {
     const restoredModified = planned.filter(
       (c) => c.type === "modified" && restoreIds.has(c.pageId)
     ).length;
+    const restoredPaths = [
+      ...[
+        ...restoreChanges,
+        ...planned.filter((c) => c.type === "modified" && restoreIds.has(c.pageId))
+      ].map((change) => this.stateDb.getByNotionId(change.pageId)?.obsidianPath).filter((path) => path !== void 0),
+      ...rows.filter((row) => row.operation === "update" && row.restore).map((row) => row.path)
+    ];
     const rowCount = (operation, restore = false) => rows.filter((row) => row.operation === operation && (row.restore ?? false) === restore).length;
     return {
       created: count("created") + rowCount("create"),
@@ -22655,6 +23098,7 @@ var PullPlanner = class {
       // 복원은 updated 에 섞지 않는다 — dry-run 이 "수정 N건" 이라고만 말하면
       // 사용자가 사라진 파일이 되살아난다는 사실을 미리 알 수 없다.
       restored: restoreChanges.length + restoredModified + rowCount("update", true),
+      ...restoredPaths.length > 0 ? { restoredPaths } : {},
       conflicts: [],
       writtenPaths: [],
       failed,
@@ -22729,6 +23173,42 @@ var PullPlanner = class {
   }
 };
 
+// src/sync/deletion-sweep.ts
+var DELETION_SWEEP_CURSOR_META_KEY = "deletion_sweep_cursor";
+var DELETION_SWEEP_BUDGET = 15;
+function sweepable(records, skip) {
+  return records.filter((r) => r.notionPageId !== null && !skip.has(idOf(r))).sort((a, b) => idOf(a) < idOf(b) ? -1 : idOf(a) > idOf(b) ? 1 : 0);
+}
+function sweepBatch(records, cursor, skip, budget = DELETION_SWEEP_BUDGET) {
+  const ordered = sweepable(records, skip);
+  if (ordered.length === 0) return { batch: [], next: null, complete: true };
+  if (ordered.length <= budget) {
+    return { batch: ordered, next: idOf(ordered[ordered.length - 1]), complete: true };
+  }
+  const start = Math.max(0, cursor === null ? 0 : ordered.findIndex((r) => idOf(r) > cursor));
+  const batch = Array.from({ length: budget }, (_, i) => ordered[(start + i) % ordered.length]);
+  return { batch, next: idOf(batch[batch.length - 1]), complete: false };
+}
+function trackedDescendants(records, goneIds) {
+  const gone = new Set(goneIds);
+  const out = [];
+  for (let grew = true; grew; ) {
+    grew = false;
+    for (const record of records) {
+      if (record.notionPageId === null || record.notionParentId === null) continue;
+      const id = idOf(record);
+      if (gone.has(id) || !gone.has(compactNotionId(record.notionParentId))) continue;
+      gone.add(id);
+      out.push(record);
+      grew = true;
+    }
+  }
+  return out;
+}
+function idOf(record) {
+  return compactNotionId(record.notionPageId);
+}
+
 // src/sync/remote-detector.ts
 var RemoteDetector = class _RemoteDetector {
   constructor(config, stateDb, notionClient, observation) {
@@ -22764,6 +23244,12 @@ var RemoteDetector = class _RemoteDetector {
   // Notion 에서 부모가 바뀐 추적 페이지(정규화 id → 새 부모 페이지 id) — pull 이 볼트에서도 옮긴다(ADR-039).
   // 옮겨도 수정 시각이 바뀌지 않아(실측) 변경으로는 보이지 않는다. 감지마다 다시 채운다.
   _moved = /* @__PURE__ */ new Map();
+  // 증분 감지가 search 로 살아 있다고 본 페이지(압축 id) — 삭제 확인이 다시 묻지 않는다.
+  _seenAlive = /* @__PURE__ */ new Set();
+  // 이번 감지가 삭제를 물은 뒤의 커서 — pull 이 마칠 때 적는다({@link saveDeletionSweep}). undefined 면 묻지 않았다.
+  _sweepCursor;
+  // 이번 감지가 추적 중인 것을 모두 물었나 — 그러면 증분이어도 미룬 삭제가 없다.
+  _sweptAll = false;
   /** 이번 감지에서 자식 페이지를 가진 것으로 본 페이지인가 — 폴더노트 판정의 1차 근거. */
   hasChildPages(pageId) {
     return this._childParentIds.has(normalizeNotionId(pageId));
@@ -22805,7 +23291,7 @@ var RemoteDetector = class _RemoteDetector {
       throwIfAborted(signal);
       try {
         const page = await this.notionClient.getPage(childId);
-        if (page.in_trash || page.archived) continue;
+        if (isTrashedOrArchived(page)) continue;
         const actualParent = await extractParentId(this.notionClient, page);
         if (!actualParent || !notionIdsEqual(actualParent, parentId)) continue;
         this._childParentIds.add(normalizeNotionId(parentId));
@@ -22868,10 +23354,83 @@ var RemoteDetector = class _RemoteDetector {
    * @param options.databases 바뀐 DB 도 찾는다(pull · dry-run). 상태 확인은 DB 를 조회하지 않아 찾지 않는다.
    */
   async detectRemote(scan, options) {
+    this._seenAlive.clear();
+    this._sweepCursor = void 0;
+    this._sweptAll = false;
     const detection = scan.kind === "full" ? { changes: await this.detectRemoteChanges(options.signal), databaseIds: null } : await this.detectRemoteChangesIncremental(scan.since, options);
+    if (options.databases) {
+      detection.changes.push(
+        ...await this.sweepDeletions(scan, detection.changes, options.signal)
+      );
+    }
     this.beginDetection(detection.changes);
     return detection;
   }
+  /**
+   * 이번 감지가 보지 못하는 삭제를 차례로 몇 개씩 원격에 묻는다({@link sweepBatch}). Notion 은 지운 것을
+   * 목록으로 주지 않는다 — search · DB 조회 모두 휴지통을 돌려주지 않고 거르지도 못한다(ADR-044).
+   *
+   * - 증분 → 추적 중인 페이지 · 행 모두가 차례에 든다. search 가 살아 있다고 보인 것은 뺀다.
+   * - 전체 대조 → 조회 필터를 단 DB 의 행만. 나머지는 순회 · DB 조회가 가른다. 필터를 단 DB 는 조회에 없는
+   *   행이 필터 밖인지 지워진 것인지 몰라 가르지 않는다(DatabaseSyncer) — 여기서 하나씩 묻는다.
+   *
+   * 지워진 페이지 아래의 추적 페이지는 차례와 상관없이 함께 묻는다 — 부모를 휴지통에 넣으면 그 아래도 모두
+   * 휴지통이다(실측 2026-10-28). 삭제는 deleteSync 일 때만, 첫 pull 이 아닐 때만 가른다 — 전체 대조와 같다.
+   */
+  async sweepDeletions(scan, found2, signal) {
+    if (!this.config.sync.deleteSync || !this.stateDb.getMeta(LAST_PULL_META_KEY)) return [];
+    const records = this.stateDb.getAll();
+    const candidates = scan.kind === "incremental" ? records : records.filter((r) => this.inFilteredDatabase(r));
+    const skip = /* @__PURE__ */ new Set([...this._seenAlive, ...found2.map((c) => compactNotionId(c.pageId))]);
+    const { batch, next, complete: complete2 } = sweepBatch(
+      candidates,
+      this.stateDb.getMeta(DELETION_SWEEP_CURSOR_META_KEY) || null,
+      skip
+    );
+    this._sweepCursor = next;
+    this._sweptAll = scan.kind === "incremental" && complete2;
+    const deletions = [];
+    const gone = /* @__PURE__ */ new Set();
+    const ask = async (record) => {
+      throwIfAborted(signal);
+      const id = compactNotionId(record.notionPageId);
+      try {
+        if ((await remotePresence(this.notionClient, record.notionPageId)).kind !== "gone") return;
+      } catch (error) {
+        getLogger().warn(
+          `[Im-Nobsidian] ${record.obsidianPath} \u2014 \uC6D0\uACA9\uC744 \uD655\uC778\uD558\uC9C0 \uBABB\uD574 \uC774\uBC88\uC5D0\uB294 \uC0AD\uC81C\uB97C \uAC00\uB974\uC9C0 \uC54A\uC74C:`,
+          error
+        );
+        return;
+      }
+      gone.add(id);
+      deletions.push(remoteDeletionChange(record));
+    };
+    for (const record of batch) await ask(record);
+    const asked = new Set(batch.map((r) => compactNotionId(r.notionPageId)));
+    for (const record of trackedDescendants(records, gone)) {
+      const id = compactNotionId(record.notionPageId);
+      if (!asked.has(id) && !skip.has(id)) await ask(record);
+    }
+    return deletions;
+  }
+  /** 조회 필터(`pullFilter`)를 단 설정 DB 의 행인가. */
+  inFilteredDatabase(record) {
+    if (record.fileType !== "db-row" || record.notionParentId === null) return false;
+    return (this.config.notion.databases ?? []).some(
+      (db) => db.pullFilter !== void 0 && notionIdsEqual(db.databaseId, record.notionParentId)
+    );
+  }
+  /** 이번 감지가 추적 중인 페이지 · 행을 모두 원격에 물었나 — 결과의 `deletionsDeferred` 를 가른다. */
+  deletionsChecked() {
+    return this._sweptAll;
+  }
+  /** 삭제를 물은 자리를 적는다 — 다음 pull 이 이어서 묻는다. 경로를 좁힌 pull · dry-run 은 부르지 않는다. */
+  saveDeletionSweep() {
+    if (this._sweepCursor !== void 0) {
+      this.stateDb.setMeta(DELETION_SWEEP_CURSOR_META_KEY, this._sweepCursor ?? "");
+    }
+  }
   /**
    * 전체 대조 — 루트 아래 페이지를 모두 훑고 추적 중인데 목록에 없는 페이지를 원격에 물어 삭제를
    * 가른다. 취소하면 {@link OperationAbortedError} 를 던진다 — 다 훑지 못한 목록으로 삭제를 가르지
@@ -23012,9 +23571,8 @@ var RemoteDetector = class _RemoteDetector {
   }
   /**
    * 증분 원격 변경 감지 — `since` 이후 수정된 페이지만 search 로 받아 created/modified 만
-   * 만든다. **삭제는 감지하지 않는다**: search API 는 in_trash/archived 페이지를 반환하지 않아
-   * (=사라진 것을 증분만으로는 구분 불가) 삭제는 전체 대조(`detectRemoteChanges`)가 가른다.
-   * 전체 대조는 주기마다 돈다(ADR-027 — 예전에는 deleteSync 가 켜져 있으면 매번 돌았다. I10).
+   * 만든다. search API 는 in_trash/archived 페이지를 반환하지 않아 삭제는 여기서 보이지 않는다 —
+   * 차례로 묻는 삭제 확인({@link sweepDeletions})과 주기마다 도는 전체 대조(ADR-027)가 가른다.
    *
    * 바뀐 행 · 새 행 · 스키마를 고친 DB 도 모은다 — pull 은 그 DB 만 조회한다. 새 행은 페이지로 받지
    * 않는다: DB 조회가 행 속성과 함께 받는다. 그래서 부모를 묻지 않는다(행마다 요청 1회 이상 아낀다).
@@ -23032,6 +23590,7 @@ var RemoteDetector = class _RemoteDetector {
     const recentPages = await this.notionClient.searchRecentPages(searchSince, options.signal);
     const untracked = [];
     for (const page of recentPages) {
+      this._seenAlive.add(compactNotionId(page.id));
       const record = this.stateDb.getByNotionId(page.id);
       if (!record) {
         if (page.parentDatabaseId) {
@@ -23185,6 +23744,9 @@ function isRerenderable(record) {
 }
 
 // src/sync/missing-local-files.ts
+function restoredWhenMissing(record) {
+  return record.notionPageId !== null && !isFolderRecord(record) && (record.fileType === "file" || record.fileType === "folder-note" || record.fileType === "db-row");
+}
 async function detectMissingLocalFiles(config, stateDb, vaultFs, paths) {
   if (config.sync.deleteSync) return [];
   const records = stateDb.getAll();
@@ -23463,11 +24025,11 @@ ${text}
     skipped.push({ what: "\uBCF4\uAE30", reason: ".base \uB97C \uC77D\uC9C0 \uBABB\uD588\uB2E4" });
     return [];
   }
-  const idOf = /* @__PURE__ */ new Map();
-  for (const p of properties) idOf.set(p.type === "title" ? "file.name" : p.name, p.id);
+  const idOf2 = /* @__PURE__ */ new Map();
+  for (const p of properties) idOf2.set(p.type === "title" ? "file.name" : p.name, p.id);
   const columnId = (raw) => {
     if (typeof raw !== "string") return void 0;
-    return idOf.get(raw) ?? idOf.get(raw.replace(/^note\./, ""));
+    return idOf2.get(raw) ?? idOf2.get(raw.replace(/^note\./, ""));
   };
   const views = [];
   const list = Array.isArray(parsed.views) ? parsed.views : [];
@@ -23762,6 +24324,7 @@ var SyncOrchestrator = class {
     this.rowSchemas.clear();
     this.placement.resetUnpreparedFolders();
     this.databaseCreator.reset();
+    this.pusher.takeReadOnlySkips();
     if (!options?.dryRun) await this.recovery.recoverInterruptedPushOps();
     const plan = await this.planner.planLocalChanges(await this.vaultFs.listMarkdownFileStats());
     const view = this.planner.localView(plan);
@@ -23815,6 +24378,8 @@ var SyncOrchestrator = class {
         view.lookup,
         !options?.paths
       );
+      const unsentDeletions2 = applicable.filter((change) => this.unsentDeletion(change)).map((change) => change.path);
+      const readOnlySkipped = await this.pusher.previewReadOnlySkips(applicable);
       return {
         createdDatabases: newDatabases.size,
         created: count("create"),
@@ -23822,13 +24387,16 @@ var SyncOrchestrator = class {
         deleted: count("delete"),
         moved: count("move"),
         failed: refusedFailures,
-        duration: Date.now() - startTime
+        duration: Date.now() - startTime,
+        ...unsentDeletions2.length > 0 ? { unsentDeletions: unsentDeletions2 } : {},
+        ...readOnlySkipped.length > 0 ? { readOnlySkipped } : {}
       };
     }
     this.stateDb.setMeta(PUSH_IN_PROGRESS_META_KEY, "true");
     await this.observation.resolveBotUserId();
     const counts = { created: 0, updated: 0, deleted: 0, moved: 0 };
     const failed = [...refusedFailures];
+    const unsentDeletions = [];
     let completed = 0;
     const total = movableFolders.length + applicable.length;
     counts.moved += await this.pusher.pushFolderMoves(
@@ -23856,6 +24424,7 @@ var SyncOrchestrator = class {
         case "deleted": {
           const propagated = await this.pusher.pushDelete(change.path);
           if (propagated) counts.deleted++;
+          else if (this.unsentDeletion(change)) unsentDeletions.push(change.path);
           break;
         }
       }
@@ -24011,9 +24580,20 @@ var SyncOrchestrator = class {
       deleted: counts.deleted,
       moved: counts.moved,
       failed,
-      duration: Date.now() - startTime
+      duration: Date.now() - startTime,
+      readOnlySkipped: this.pusher.takeReadOnlySkips(),
+      ...unsentDeletions.length > 0 ? { unsentDeletions } : {}
     };
   }
+  /**
+   * 볼트에서 지운 이 노트를 Notion 에서 지우지 않아 다음 pull 이 되살리나 — deleteSync 가 꺼져 있고 pull 이
+   * 되살리는 레코드일 때. 예전에는 대기로 적기만 하고 알리지 않아, 지운 파일이 말없이 돌아왔다(D8).
+   */
+  unsentDeletion(change) {
+    if (change.type !== "deleted" || this.config.sync.deleteSync) return false;
+    const record = this.stateDb.getByPath(change.path);
+    return !!record && restoredWhenMissing(record);
+  }
   /**
    * 만든 DB 에 relation · rollup · formula 를 붙이고, 행 스키마를 다시 읽게 한 뒤 보기를 만든다. 실패는
    * 다음 push 가 이어 붙인다 — 행은 그대로 올린다.
@@ -24086,6 +24666,7 @@ var SyncOrchestrator = class {
     this.assertConnectionScope();
     this.puller.beginPull();
     this.rowSchemas.clear();
+    this.databaseSyncer.takeRestoredRows();
     const emptyResult = {
       created: 0,
       updated: 0,
@@ -24118,6 +24699,7 @@ var SyncOrchestrator = class {
     this.discovery.clearInlineRefs();
     const conflicts = [];
     const writtenPaths = [];
+    const restoredPaths = [];
     const excluded = [];
     const failed = [];
     let detected = [];
@@ -24161,7 +24743,9 @@ var SyncOrchestrator = class {
       pendingDatabases
     );
     const finalize = async (created, updated, deleted, restored = 0) => {
+      await this.puller.removeVacatedFolders();
       const renamedRows = this.databaseSyncer.takeRenamedRows();
+      restoredPaths.push(...this.databaseSyncer.takeRestoredRows());
       const relinked = await this.linkUpdater.apply([...relocated.applied, ...renamedRows.applied]);
       const linkCount = writtenPaths.length > 0 ? await this.resolveNotionLinks(writtenPaths) : 0;
       if (!options?.paths) {
@@ -24177,6 +24761,7 @@ var SyncOrchestrator = class {
           this.stateDb.setMeta(LAST_FULL_PULL_META_KEY, startedAt);
         }
         this.detector.savePendingDatabases(ledger);
+        this.detector.saveDeletionSweep();
       }
       this.stateDb.setMeta(LAST_SYNC_META_KEY, (/* @__PURE__ */ new Date()).toISOString());
       this.stateDb.setMeta(PULL_IN_PROGRESS_META_KEY, "");
@@ -24185,6 +24770,7 @@ var SyncOrchestrator = class {
         updated,
         deleted,
         restored,
+        ...restoredPaths.length > 0 ? { restoredPaths } : {},
         conflicts,
         writtenPaths,
         failed,
@@ -24196,7 +24782,8 @@ var SyncOrchestrator = class {
           ...remoteScanInfo(
             scan,
             this.stateDb.getMeta(LAST_FULL_PULL_META_KEY),
-            this.config.sync.deleteSync
+            this.config.sync.deleteSync,
+            this.detector.deletionsChecked()
           ),
           skippedDatabases: ledger.skipped
         },
@@ -24247,6 +24834,10 @@ var SyncOrchestrator = class {
       );
       return {
         ...plan,
+        remoteScan: plan.remoteScan && {
+          ...plan.remoteScan,
+          deletionsDeferred: plan.remoteScan.deletionsDeferred && !this.detector.deletionsChecked()
+        },
         moved: relocated.moved,
         moveSkipped: relocated.skipped,
         excluded: [...exclusions.values()]
@@ -24340,8 +24931,10 @@ var SyncOrchestrator = class {
             conflicts.push(outcome.conflict);
           } else if (outcome.action === "written") {
             writtenPaths.push(outcome.path);
-            if (restoreIds.has(change.pageId)) counts.restored++;
-            else counts.updated++;
+            if (restoreIds.has(change.pageId)) {
+              counts.restored++;
+              restoredPaths.push(outcome.path);
+            } else counts.updated++;
           }
           return {
             path: outcome.path,
@@ -24569,7 +25162,12 @@ var SyncOrchestrator = class {
       this.stateDb,
       this.config.notion.rootPageId
     );
-    return { databases, pages, complete: databases.complete && (pages?.complete ?? true) };
+    return {
+      databases,
+      pages,
+      nestedFolderPages: findNestedFolderPages(this.stateDb.getAll()),
+      complete: databases.complete && (pages?.complete ?? true)
+    };
   }
   async fetch() {
     return this.gate.run("fetch", () => this.executeFetch());
@@ -24814,6 +25412,19 @@ var NodeVaultFS = class {
     const fullPath = join(this.rootPath, path);
     await unlink(fullPath);
   }
+  /** `rmdir` 는 비지 않은 폴더를 지우지 않는다(ENOTEMPTY) — 숨김 파일도 그대로 둔다. */
+  async removeEmptyFolder(path) {
+    try {
+      await rmdir(join(this.rootPath, path));
+      return true;
+    } catch (error) {
+      const code = error.code;
+      if (code === "ENOTEMPTY" || code === "EEXIST" || code === "ENOENT" || code === "ENOTDIR") {
+        return false;
+      }
+      throw error;
+    }
+  }
   async moveFile(from, to) {
     const fromPath = join(this.rootPath, from);
     const toPath = join(this.rootPath, to);
@@ -25772,6 +26383,9 @@ var FilteredVaultFS = class {
   ensureFolder(path) {
     return this.inner.ensureFolder(path);
   }
+  async removeEmptyFolder(path) {
+    return await this.inner.removeEmptyFolder?.(path) ?? false;
+  }
   getFileStat(path) {
     return this.inner.getFileStat(path);
   }
@@ -25998,6 +26612,6 @@ function formatRatio(ratio) {
   return String(Math.round(ratio * 100) / 100);
 }
 
-export { BaseFileGenerator, BlankLineCollapser, CONFIG_FILE, CalloutRestorer, CalloutTransformer, ChangeDetector, ColorAnnotator, ConfigManager, ConfigSchema, ConflictResolver, ConnectionBoundaryError, ConnectionScopeError, ConversionPipeline, DB_VIEWS_FILE, DB_VIEWS_PATH, DEFAULT_CONFIG, DEFAULT_TITLE_PROPERTY, DEFAULT_WATCH_DEBOUNCE_MS, DIFF_SIGN, DatabaseSyncer, EmbedResolver, EntryEditor, FileHandler, FileWatcher, FilteredVaultFS, FrontmatterExtractor, FrontmatterGenerator, GITIGNORE_ENTRY, IGNORE_FILE, INTERNAL_DIR, INTERNAL_DIR_GLOB, ImageHandler, InlineAnnotationPreserver, InlineDBParser, LocalImageRestorer, MARKER_BRAND, MathNormalizer, MentionToWikilink, NOTION_COLOR_NAMES, NOTION_TOKEN_PREFIX, NOTION_TO_BASES_VIEW, NodeVaultFS, NotionBlockBuilder, NotionClient, OBSIDIAN_CONFIG_DIR, PathFilter, PendingWalError, PreserveMarkerCollector, PreserveMarkerInjector, PropertiesTableInjector, PropertiesTableRestorer, PropertyMapper, RENDER_LINE_RULES, SAVED_STATE_TABLES_QUERY, SEPARATOR_BODY, STATE_DB_FILE, STATE_DB_MIGRATIONS, STATE_DB_PATH, SavedStateDbError, ScopedVaultFS, SidecarGenerator, StateDB, StateDbLockedError, StateDbUnavailableError, StateLock, SyncBusyError, SyncOrchestrator, TreeMapper, UnsupportedBlockStripper, ViewDataProvider, WIKILINK_LOOKUPS, WatchSyncService, WikilinkResolver, applicableChoices, assertNoPendingWal, basesViewMappingOf, basesViewTypeOf, choiceForStrategy, classifyBodyFidelity, columnLabel, compactNotionId, computeBufferHash, computeHash, configDirFrom, connectionFolderOf, createDefaultPipeline, extractCalendarEntries, filterByMonth, filterEntries, findConnectionFolders, formatUnifiedDiff, generateColorCSS, generateId, getLogger, getNotionBgColor, getNotionColor, getVisibleProperties, groupEntries, hasColumnLayout, hasDesignMarker, inAnyPathScope, isInternalPath, isMarkdownPath, isRemoteDeletion, lineDiff, lintRenderedMarkdown, matchesPathScope, normalizeNotionId, normalizeVaultPath, noteNameFromPath, notionIdFromInput, notionIdsEqual, operationLabel, parseDesignColor, parseIgnorePatterns, pendingWalBytes, readColumnLayout, readDesignLine, resolvePropertyName, sanitizeFileName, setLogger, sortEntries, stateDbLockPath, stateDbWalPath, stripMarkdownExtension, summarizeFidelity, systemTimeZone, threeWayMerge, toVaultPath, translateNotionFilter, verifyDatabaseCompleteness, verifyPageCompleteness, wikilinkLookupsIn };
+export { BaseFileGenerator, BlankLineCollapser, CONFIG_FILE, CalloutRestorer, CalloutTransformer, ChangeDetector, ColorAnnotator, ConfigManager, ConfigSchema, ConflictResolver, ConnectionBoundaryError, ConnectionScopeError, ConversionPipeline, DB_VIEWS_FILE, DB_VIEWS_PATH, DEFAULT_CONFIG, DEFAULT_TITLE_PROPERTY, DEFAULT_WATCH_DEBOUNCE_MS, DIFF_SIGN, DatabaseSyncer, EmbedResolver, EntryEditor, FileHandler, FileWatcher, FilteredVaultFS, FrontmatterExtractor, FrontmatterGenerator, GITIGNORE_ENTRY, IGNORE_FILE, INTERNAL_DIR, INTERNAL_DIR_GLOB, ImageHandler, InlineAnnotationPreserver, InlineDBParser, LocalImageRestorer, MARKER_BRAND, MathNormalizer, MentionToWikilink, NOTION_COLOR_NAMES, NOTION_TOKEN_PREFIX, NOTION_TO_BASES_VIEW, NodeVaultFS, NotionBlockBuilder, NotionClient, OBSIDIAN_CONFIG_DIR, PathFilter, PendingWalError, PreserveMarkerCollector, PreserveMarkerInjector, PropertiesTableInjector, PropertiesTableRestorer, PropertyMapper, RENDER_LINE_RULES, SAVED_STATE_TABLES_QUERY, SEPARATOR_BODY, STATE_DB_FILE, STATE_DB_MIGRATIONS, STATE_DB_PATH, SavedStateDbError, ScopedVaultFS, SidecarGenerator, StateDB, StateDbLockedError, StateDbUnavailableError, StateLock, SyncBusyError, SyncOrchestrator, TreeMapper, UnsupportedBlockStripper, ViewDataProvider, WIKILINK_LOOKUPS, WatchSyncService, WikilinkResolver, applicableChoices, assertNoPendingWal, basesViewMappingOf, basesViewTypeOf, choiceForStrategy, classifyBodyFidelity, columnLabel, compactNotionId, computeBufferHash, computeHash, configDirFrom, connectionFolderOf, createDefaultPipeline, extractCalendarEntries, filterByMonth, filterEntries, findConnectionFolders, findNestedFolderPages, formatUnifiedDiff, generateColorCSS, generateId, getLogger, getNotionBgColor, getNotionColor, getVisibleProperties, groupEntries, hasColumnLayout, hasDesignMarker, inAnyPathScope, isHeadingLine, isHeadingMarkerLine, isInternalPath, isMarkdownPath, isRemoteDeletion, lineDiff, lintRenderedMarkdown, matchesPathScope, normalizeNotionId, normalizeVaultPath, noteNameFromPath, notionIdFromInput, notionIdsEqual, operationLabel, parseDesignColor, parseIgnorePatterns, pendingWalBytes, readColumnLayout, readDesignLine, resolvePropertyName, sanitizeFileName, sectionLinesWithHeadingMarkers, setLogger, sortEntries, stateDbLockPath, stateDbWalPath, stripMarkdownExtension, summarizeFidelity, systemTimeZone, threeWayMerge, toVaultPath, translateNotionFilter, verifyDatabaseCompleteness, verifyPageCompleteness, wikilinkLookupsIn };
 //# sourceMappingURL=index.js.map
 //# sourceMappingURL=index.js.map