@im-nobsidian/core 0.12.0 → 0.13.0

package/dist/index.js

@@ -457,6 +457,10 @@ function notionIdsEqual(a, b) {
 function compactNotionId(id) {
   return id.replace(/-/g, "").toLowerCase();
 }
+var SHORT_NOTION_ID_LENGTH = 8;
+function shortNotionId(id) {
+  return compactNotionId(id).slice(0, SHORT_NOTION_ID_LENGTH);
+}
 
 // src/utils/logger.ts
 var consoleLogger = {
@@ -1679,6 +1683,9 @@ function isFrontmatterDate(value) {
 }
 var RANGE_END_SUFFIX = "_end";
 var DATE_VALUED_TYPES = /* @__PURE__ */ new Set(["date", "formula", "rollup"]);
+function mayHaveRangeEnd(type) {
+  return DATE_VALUED_TYPES.has(type);
+}
 var TIMESTAMP_TYPES = /* @__PURE__ */ new Set(["created_time", "last_edited_time"]);
 var READ_ONLY_TYPES = /* @__PURE__ */ new Set([
   "created_time",
@@ -2804,6 +2811,10 @@ var DiscoveryTooLargeError = class extends Error {
 };
 var NOT_IDEMPOTENT = { idempotent: false };
 var CREATES_BLOCKS = { idempotent: false, createsBlocks: true };
+function rowParentOf(params) {
+  if (params.parentType === "page") return { page_id: params.parentId };
+  return params.dataSourceId ? { type: "data_source_id", data_source_id: params.dataSourceId } : { database_id: params.parentId };
+}
 function parentDatabaseIdOf(page) {
   const parent = page.parent;
   if (parent?.type !== "data_source_id" && parent?.type !== "database_id") return null;
@@ -2951,7 +2962,7 @@ var NotionClient = class _NotionClient {
     );
   }
   async createPage(params) {
-    const parent = params.parentType === "database" ? { database_id: params.parentId } : { page_id: params.parentId };
+    const parent = rowParentOf(params);
     const properties = params.parentType === "page" ? { title: { title: [{ text: { content: params.title } }] } } : params.properties ?? {
       title: { title: [{ text: { content: params.title } }] }
     };
@@ -3021,7 +3032,7 @@ var NotionClient = class _NotionClient {
     return ds.properties ?? {};
   }
   async createPageWithMarkdown(params) {
-    const parent = params.parentType === "database" ? { database_id: params.parentId } : { page_id: params.parentId };
+    const parent = rowParentOf(params);
     const properties = params.parentType === "page" ? { title: { title: [{ text: { content: params.title } }] } } : params.properties ?? {
       title: { title: [{ text: { content: params.title } }] }
     };
@@ -3183,6 +3194,7 @@ var NotionClient = class _NotionClient {
     const dataSources = db.data_sources ?? [];
     const merged = {};
     const owners = [];
+    const own = /* @__PURE__ */ new Map();
     let anyAccessible = false;
     for (const ds of dataSources) {
       try {
@@ -3192,6 +3204,7 @@ var NotionClient = class _NotionClient {
         owners.push(dsObj.parent?.database_id);
         if (dsObj.properties && Object.keys(dsObj.properties).length > 0) {
           anyAccessible = true;
+          own.set(ds.id, dsObj.properties);
           for (const [name, prop] of Object.entries(dsObj.properties)) {
             if (!(name in merged)) merged[name] = prop;
           }
@@ -3203,7 +3216,11 @@ var NotionClient = class _NotionClient {
     const meta = {
       databaseId,
       title: Array.isArray(db.title) ? db.title[0]?.plain_text ?? "" : "",
-      dataSources: dataSources.map((ds) => ({ id: ds.id, name: ds.name ?? "" })),
+      dataSources: dataSources.map((ds) => ({
+        id: ds.id,
+        name: ds.name ?? "",
+        ...own.has(ds.id) ? { properties: own.get(ds.id) } : {}
+      })),
       properties: anyAccessible ? merged : db.properties ?? {},
       isInline: db.is_inline === true,
       appearance: {
@@ -3412,7 +3429,7 @@ var NotionClient = class _NotionClient {
     if (metas.length > 1) {
       const label = metas.map((m) => m.name || m.id).join(", ");
       getLogger().warn(
-        `[Notion] DB ${databaseId} \uC5D0 data source ${metas.length}\uAC1C \uBC1C\uACAC \u2014 \uC804 \uC18C\uC2A4 \uD589\uC744 \uD55C \uD3F4\uB354\uB85C \uBCD1\uD569 \uB3D9\uAE30\uD654\uD569\uB2C8\uB2E4 (${label}). \uC18C\uC2A4\uBCC4 \uD0ED \uAD6C\uBD84\uC740 .base \uBDF0\uC5D0 \uBCF4\uC874\uB418\uC9C0 \uC54A\uC2B5\uB2C8\uB2E4.`
+        `[Notion] DB ${shortNotionId(databaseId)} \uC5D0 data source ${metas.length}\uAC1C \uBC1C\uACAC \u2014 \uC804 \uC18C\uC2A4 \uD589\uC744 \uD55C \uD3F4\uB354\uB85C \uBCD1\uD569 \uB3D9\uAE30\uD654\uD569\uB2C8\uB2E4 (${label}). \uC18C\uC2A4\uBCC4 \uD0ED \uAD6C\uBD84\uC740 .base \uBDF0\uC5D0 \uBCF4\uC874\uB418\uC9C0 \uC54A\uC2B5\uB2C8\uB2E4.`
       );
     }
     const all = [];
@@ -3902,14 +3919,14 @@ var NotionClient = class _NotionClient {
     const blockOwner = /* @__PURE__ */ new Map();
     const resolveBlockOwner = async (blockId) => {
       const seen = /* @__PURE__ */ new Set();
-      const settle = (owner) => {
+      const settle2 = (owner) => {
         for (const b of seen) blockOwner.set(b, owner);
         return owner;
       };
       let bid = blockId;
       for (let i = 0; i < 20 && bid && !seen.has(bid); i++) {
         const cached = blockOwner.get(bid);
-        if (cached !== void 0) return settle(cached);
+        if (cached !== void 0) return settle2(cached);
         seen.add(bid);
         let bp;
         try {
@@ -3918,14 +3935,14 @@ var NotionClient = class _NotionClient {
           getLogger().warn(
             `[Im-Nobsidian] \uBD80\uBAA8 \uBE14\uB85D \uD574\uC18C \uC2E4\uD328 (${bid}) \u2014 \uC774 \uBE14\uB85D\uC5D0 \uC911\uCCA9\uB41C \uD398\uC774\uC9C0\uB294 search \uB514\uC2A4\uCEE4\uBC84\uB9AC\uC5D0\uC11C \uC81C\uC678\uB428: ${error instanceof Error ? error.message : String(error)}`
           );
-          return settle(null);
+          return settle2(null);
         }
-        if (bp.type === "page_id" && bp.page_id) return settle(bp.page_id);
+        if (bp.type === "page_id" && bp.page_id) return settle2(bp.page_id);
         if (bp.type === "block_id" && bp.block_id) {
           bid = bp.block_id;
           continue;
         }
-        return settle(null);
+        return settle2(null);
       }
       return null;
     };
@@ -4019,6 +4036,15 @@ var NotionClient = class _NotionClient {
   async deleteView(viewId) {
     await this.withRateLimit(() => this.client.views.delete({ view_id: viewId }));
   }
+  /**
+   * 보기를 고친다(ADR-046). 보내지 않은 항목은 그대로 두고 null 은 지운다. `configuration.properties` 는 통째로 바뀐다 —
+   * 목록에 없는 속성은 숨겨지고 목록 차례가 열 차례다(2026-10-29 실측).
+   */
+  async updateView(viewId, request) {
+    await this.withRateLimit(
+      () => this.client.views.update({ ...request, view_id: viewId })
+    );
+  }
   async getView(viewId) {
     const view = await this.withRateLimit(() => this.client.views.retrieve({ view_id: viewId }));
     const v = view;
@@ -6962,8 +6988,8 @@ function assemble(p, fitted) {
       addLines(linesAt, spot.line, spot.exact ? lines : requote(lines, neighbor(p, spot.line)));
     }
   }
-  for (const group of groupLoose(p, loose)) {
-    addLines(linesAt, group.at, fitLines(p, group.at, group.lines));
+  for (const group2 of groupLoose(p, loose)) {
+    addLines(linesAt, group2.at, fitLines(p, group2.at, group2.lines));
   }
   return joinLines(p, linesAt, inlineAt);
 }
@@ -8042,6 +8068,53 @@ function mergeRowFrontmatter(localNote, pulled, owned) {
   }
   return frontmatterLines(values);
 }
+function rekeyRowFrontmatter(localNote, renamed, dropped) {
+  let local;
+  try {
+    local = splitFrontmatter(localNote);
+  } catch {
+    return null;
+  }
+  if (!local.hasFrontmatter) return null;
+  const keys = Object.keys(local.data);
+  const drops = new Set(keys.filter((key) => dropped(key, local.data[key])));
+  const staying = new Set(keys.filter((key) => !drops.has(key) && !renamed.has(key)));
+  const target = /* @__PURE__ */ new Map();
+  for (const key of keys) {
+    const next = renamed.get(key);
+    if (next === void 0 || next === key || drops.has(key) || staying.has(next)) continue;
+    if ([...target.values()].includes(next)) continue;
+    target.set(key, next);
+  }
+  if (drops.size === 0 && target.size === 0) return null;
+  const values = {};
+  for (const key of keys) {
+    if (drops.has(key)) continue;
+    values[target.get(key) ?? key] = plainFrontmatterValue(local.data[key]);
+  }
+  const chunks = localChunks(localNote, local.data);
+  if (chunks !== null) {
+    const lines = [];
+    for (const chunk of chunks) {
+      if (chunk.key !== "" && !drops.has(chunk.key)) {
+        const next = target.get(chunk.key);
+        lines.push(...next === void 0 ? chunk.body : renamedChunk(chunk, next, values[next]));
+      }
+      lines.push(...chunk.trailing);
+    }
+    if (readsAs(lines, values)) return lines;
+  }
+  return frontmatterLines(values);
+}
+function renamedChunk(chunk, next, value) {
+  const [first = "", ...rest] = chunk.body;
+  const tokens = [chunk.key, JSON.stringify(chunk.key), `'${chunk.key.replace(/'/g, "''")}'`];
+  const token2 = tokens.find((t) => first.startsWith(`${t}:`));
+  if (token2 === void 0) return frontmatterLines({ [next]: value });
+  const sample = frontmatterLines({ [next]: 0 })[0] ?? "";
+  const nextToken = sample.slice(0, sample.lastIndexOf(":"));
+  return [`${nextToken}${first.slice(token2.length)}`, ...rest];
+}
 function mergedKeyOrder(localKeys, pulledKeys, isOwned) {
   const pulledSet = new Set(pulledKeys);
   const order = localKeys.filter((key) => !isOwned(key) || pulledSet.has(key));
@@ -8075,15 +8148,15 @@ function localChunks(localNote, data) {
   }
   const chunks = [];
   const seen = [];
-  for (const [i, group] of groups.entries()) {
-    let end = group.length;
-    while (end > 0 && TRIVIA_RE.test(group[end - 1])) end--;
+  for (const [i, group2] of groups.entries()) {
+    let end = group2.length;
+    while (end > 0 && TRIVIA_RE.test(group2[end - 1])) end--;
     if (i === 0) {
       if (end > 0) return null;
-      chunks.push({ key: "", body: [], trailing: group });
+      chunks.push({ key: "", body: [], trailing: group2 });
       continue;
     }
-    const body = group.slice(0, end);
+    const body = group2.slice(0, end);
     let parsed;
     try {
       const split = splitFrontmatter(`---
@@ -8100,7 +8173,7 @@ ${body.join("\n")}
     const key = keys[0];
     if (!Object.hasOwn(data, key) || !sameFrontmatterValue(parsed[key], data[key])) return null;
     seen.push(key);
-    chunks.push({ key, body, trailing: group.slice(end) });
+    chunks.push({ key, body, trailing: group2.slice(end) });
   }
   const dataKeys = Object.keys(data);
   return seen.length === dataKeys.length && seen.every((key, i) => key === dataKeys[i]) ? chunks : null;
@@ -9023,8 +9096,8 @@ ${brokenLines(note2)}`;
   const lines = Math.max(note.split("\n").length, pulled.split("\n").length);
   const limit = Math.min(TRIAL_LIMIT, Math.floor(TRIAL_LINE_LIMIT / lines));
   const trial = new Trial(sent, target, slots, limit - 2);
-  const failed = trial.bisect(spots, (group, local2) => {
-    for (const spot of group) trial.slots[spot.slot] = [...local2 ? spot.local : spot.pulled];
+  const failed = trial.bisect(spots, (group2, local2) => {
+    for (const spot of group2) trial.slots[spot.slot] = [...local2 ? spot.local : spot.pulled];
   });
   for (const { slot, run } of failed) {
     if (run) trial.refine(run.local, run.pulled, (lines2) => trial.put(slot, lines2));
@@ -9186,20 +9259,20 @@ var Trial = class {
    */
   bisect(items, swap, check = () => this.fits(), tried = true) {
     const failed = [];
-    const visit = (group, seen) => {
-      if (group.length === 0) return;
+    const visit = (group2, seen) => {
+      if (group2.length === 0) return;
       if (!seen) {
-        swap(group, true);
+        swap(group2, true);
         if (check()) return;
-        swap(group, false);
+        swap(group2, false);
       }
-      if (group.length === 1 || this.budget <= 0) {
-        failed.push(...group);
+      if (group2.length === 1 || this.budget <= 0) {
+        failed.push(...group2);
         return;
       }
-      const half = group.length >> 1;
-      visit(group.slice(0, half), false);
-      visit(group.slice(half), false);
+      const half = group2.length >> 1;
+      visit(group2.slice(0, half), false);
+      visit(group2.slice(half), false);
     };
     visit(items, tried);
     return failed;
@@ -9239,8 +9312,8 @@ var Trial = class {
     const differs = own.flatMap((lines, k) => sameLines(lines, theirs[k]) ? [] : [k]);
     const failed = this.bisect(
       differs,
-      (group, useLocal) => {
-        for (const k of group) chosen[k] = [...(useLocal ? own : theirs)[k]];
+      (group2, useLocal) => {
+        for (const k of group2) chosen[k] = [...(useLocal ? own : theirs)[k]];
       },
       () => put(chosen.flat())
     );
@@ -9309,8 +9382,8 @@ var Trial = class {
     );
     this.bisect(
       spots,
-      (group, useLocal) => {
-        for (const spot of group) {
+      (group2, useLocal) => {
+        for (const spot of group2) {
           chosen[spot.index] = [...useLocal ? spot.local : spot.pulled];
         }
       },
@@ -10283,8 +10356,8 @@ function parseRows(body) {
 }
 function parseCols(body) {
   const head = body.search(ROW_START_RE);
-  const group = COLGROUP_RE.exec(head === -1 ? body : body.slice(0, head))?.[1] ?? "";
-  return [...group.matchAll(COL_RE)].map((col) => parseNfmAttrs(col[1] ?? ""));
+  const group2 = COLGROUP_RE.exec(head === -1 ? body : body.slice(0, head))?.[1] ?? "";
+  return [...group2.matchAll(COL_RE)].map((col) => parseNfmAttrs(col[1] ?? ""));
 }
 function sameAttrs(a, b) {
   return a.length === b.length && a.every(([k, v]) => b.some(([bk, bv]) => bk === k && bv === v));
@@ -13604,6 +13677,44 @@ function keepLargeFile(content, fileLink, download, pageId, blockId) {
   return withLargeFileLink(content, fileLink, link);
 }
 
+// src/view/relative-dates.ts
+var RELATIVE_DATE_VALUES = {
+  today: "today()",
+  tomorrow: 'today() + "1d"',
+  yesterday: 'today() - "1d"',
+  one_week_ago: 'today() - "7d"',
+  one_week_from_now: 'today() + "7d"',
+  one_month_ago: 'today() - "1M"',
+  one_month_from_now: 'today() + "1M"'
+};
+var RELATIVE_DATE_RANGES = {
+  past_week: { toward: "past", span: "7d" },
+  past_month: { toward: "past", span: "1M" },
+  past_year: { toward: "past", span: "1y" },
+  next_week: { toward: "next", span: "7d" },
+  next_month: { toward: "next", span: "1M" },
+  next_year: { toward: "next", span: "1y" }
+};
+function dateOnly(ref) {
+  return `${ref}.date()`;
+}
+function relativeRangeExprs(ref, range) {
+  const day = dateOnly(ref);
+  return range.toward === "past" ? [`${day} >= today() - "${range.span}"`, `${day} <= today()`] : [`${day} >= today()`, `${day} <= today() + "${range.span}"`];
+}
+
+// src/view/bases-file-properties.ts
+var BASES_TITLE = "file.name";
+var BASES_TIMESTAMPS = {
+  created_time: "file.ctime",
+  last_edited_time: "file.mtime"
+};
+function notionTimestampOf(column) {
+  return Object.keys(BASES_TIMESTAMPS).find(
+    (timestamp) => BASES_TIMESTAMPS[timestamp] === column
+  );
+}
+
 // src/view/notion-filter-translator.ts
 function translateNotionFilter(filter, schema, resolveName) {
   const ctx = { resolveName, schema, untranslated: /* @__PURE__ */ new Set() };
@@ -13651,7 +13762,7 @@ function translateNode(node, ctx) {
 function translateLeaf(leaf2, ctx) {
   const timestamp = leaf2["timestamp"];
   if (typeof timestamp === "string") {
-    const ref2 = timestamp === "created_time" ? "file.ctime" : "file.mtime";
+    const ref2 = BASES_TIMESTAMPS[timestamp === "created_time" ? "created_time" : "last_edited_time"];
     const cond = leaf2[timestamp];
     if (!isRecord(cond)) return unsupported(ctx, `timestamp '${timestamp}' \uD544\uD130`);
     return translateDate(ref2, cond, ctx, `timestamp '${timestamp}'`);
@@ -13775,8 +13886,8 @@ function translateStatus(ref, cond, ctx, label, propName) {
       expanded.push(name);
       continue;
     }
-    const group = prop?.groups?.find((g) => g.name === name);
-    const members = group && prop ? expandGroup(group, prop) : null;
+    const group2 = prop?.groups?.find((g) => g.name === name);
+    const members = group2 && prop ? expandGroup(group2, prop) : null;
     if (members === null) {
       return unsupported(ctx, `${label}: \uC0C1\uD0DC '${name}' \uC744 \uC635\uC158\uC73C\uB85C \uC804\uAC1C\uD558\uC9C0 \uBABB\uD568`);
     }
@@ -13787,8 +13898,8 @@ function translateStatus(ref, cond, ctx, label, propName) {
   }
   return equalityOverNames(ref, op, dedupe(expanded), ctx, label);
 }
-function expandGroup(group, prop) {
-  const ids = group.optionIds;
+function expandGroup(group2, prop) {
+  const ids = group2.optionIds;
   if (!ids || ids.length === 0) return [];
   const byId = new Map((prop.options ?? []).map((o) => [o.id, o.name]));
   const names = [];
@@ -13828,29 +13939,32 @@ function translateEmptiness(ref, cond, ctx, label) {
   const [op] = firstEntry(cond);
   return unsupported(ctx, `${label}: \uC5F0\uC0B0\uC790 '${op}' \uBBF8\uC9C0\uC6D0`);
 }
+var DATE_COMPARISONS = {
+  equals: "==",
+  before: "<",
+  after: ">",
+  on_or_before: "<=",
+  on_or_after: ">="
+};
 function translateDate(ref, cond, ctx, label) {
   const empt = translateEmptinessOnly(ref, cond);
   if (empt) return empt;
   const [op, value] = firstEntry(cond);
+  const range = Object.hasOwn(RELATIVE_DATE_RANGES, op) ? RELATIVE_DATE_RANGES[op] : void 0;
+  if (range) return { and: relativeRangeExprs(ref, range) };
   if (typeof value !== "string") {
     return unsupported(ctx, `${label}: \uC0C1\uB300 \uB0A0\uC9DC \uC870\uAC74 '${op}' \uC740 \uC62E\uAE30\uC9C0 \uC54A\uC74C`);
   }
-  const lit = str(value);
-  switch (op) {
-    case "equals":
-      return `${ref} == ${lit}`;
-    case "before":
-      return `${ref} < ${lit}`;
-    case "after":
-      return `${ref} > ${lit}`;
-    case "on_or_before":
-      return `${ref} <= ${lit}`;
-    case "on_or_after":
-      return `${ref} >= ${lit}`;
-    default:
-      return unsupported(ctx, `${label}: \uB0A0\uC9DC \uC5F0\uC0B0\uC790 '${op}' \uBBF8\uC9C0\uC6D0`);
+  const symbol = Object.hasOwn(DATE_COMPARISONS, op) ? DATE_COMPARISONS[op] : void 0;
+  if (!symbol) return unsupported(ctx, `${label}: \uB0A0\uC9DC \uC5F0\uC0B0\uC790 '${op}' \uBBF8\uC9C0\uC6D0`);
+  const relative2 = Object.hasOwn(RELATIVE_DATE_VALUES, value) ? RELATIVE_DATE_VALUES[value] : void 0;
+  if (relative2) return `${dateOnly(ref)} ${symbol} ${relative2}`;
+  if (!ISO_DATE_RE.test(value)) {
+    return unsupported(ctx, `${label}: \uB0A0\uC9DC \uAC12 '${value}' \uC744 \uD574\uC11D\uD558\uC9C0 \uBABB\uD568`);
   }
+  return `${ref} ${symbol} ${str(value)}`;
 }
+var ISO_DATE_RE = /^\d{4}-\d{2}-\d{2}(?:[T ][\d:.]+(?:Z|[+-]\d{2}:?\d{2})?)?$/;
 function translateEmptinessOnly(ref, cond) {
   if (cond["is_empty"] === true) return `${ref}.isEmpty()`;
   if (cond["is_not_empty"] === true) return `!${ref}.isEmpty()`;
@@ -13938,6 +14052,10 @@ function inFolderFilter(folderPath) {
 var IN_FOLDER_FILTER_RE = /file\.inFolder\("([^"\n]*)"\)/g;
 var BaseFileGenerator = class {
   generate(options) {
+    return this.generateWithViews(options).content;
+  }
+  /** `.base` 내용과 함께 쓴 보기마다 어느 Notion 보기에서 왔는지 돌려준다 — pull 이 기록해 push 가 견준다. */
+  generateWithViews(options) {
     const lines = [];
     lines.push(`${BASE_FILE_HEADER} from Notion DB: ${options.databaseName}`);
     lines.push(`# Database ID: ${options.databaseId}`);
@@ -13945,8 +14063,13 @@ var BaseFileGenerator = class {
     this.writeFilters(lines, options.folderPath);
     this.writeFormulas(lines, options.viewsConfig.views);
     this.writePropertyDisplayNames(lines, options.schema);
-    this.writeViews(lines, options.viewsConfig.views, options.schema, options.rangeEnds);
-    return lines.join("\n") + "\n";
+    const views = this.writeViews(
+      lines,
+      options.viewsConfig.views,
+      options.schema,
+      options.rangeEnds
+    );
+    return { content: lines.join("\n") + "\n", views };
   }
   writeFilters(lines, folderPath) {
     lines.push("filters:");
@@ -13977,12 +14100,13 @@ var BaseFileGenerator = class {
     lines.push("");
   }
   writeViews(lines, views, schema, rangeEnds = /* @__PURE__ */ new Map()) {
-    const basesViews = views.map((v) => this.convertView(v, schema, rangeEnds)).filter((v) => v !== null);
+    const converted = views.map((v) => this.convertView(v, schema, rangeEnds)).filter((v) => v !== null);
+    const basesViews = converted.map((c) => c.view);
     if (basesViews.length === 0) {
       lines.push("views:");
       lines.push("  - type: table");
       lines.push("    name: Table");
-      return;
+      return [];
     }
     this.dedupeViewNames(basesViews);
     lines.push("views:");
@@ -14014,6 +14138,7 @@ var BaseFileGenerator = class {
         this.writeFilterValue(lines, view.filters, "    ");
       }
     }
+    return converted.map(({ viewId, lossyFilter }) => ({ viewId, lossyFilter }));
   }
   /** `filters:` 키와 그 값을 쓴다. 단일 식이면 한 줄, 그룹이면 블록. */
   writeFilterValue(lines, node, indent) {
@@ -14073,6 +14198,7 @@ var BaseFileGenerator = class {
   convertView(view, schema, rangeEnds) {
     const basesType = basesViewMappingOf(view.type).type;
     if (!basesType) return null;
+    let lossyFilter = false;
     const result = {
       type: basesType,
       name: view.name || view.type
@@ -14086,7 +14212,7 @@ var BaseFileGenerator = class {
         return end === void 0 ? [this.toNoteRef(name)] : [this.toNoteRef(name), this.toNoteRef(end)];
       });
       if (visible.length > 0) {
-        result.order = ["file.name", ...visible];
+        result.order = [BASES_TITLE, ...visible];
       }
     }
     if (view.sorts && view.sorts.length > 0) {
@@ -14096,7 +14222,7 @@ var BaseFileGenerator = class {
           const propName = this.resolvePropertyName(s.property, schema) ?? s.property;
           property = this.toNoteRef(propName);
         } else if (s.timestamp) {
-          property = s.timestamp === "created_time" ? "file.ctime" : "file.mtime";
+          property = BASES_TIMESTAMPS[s.timestamp];
         } else {
           return null;
         }
@@ -14132,14 +14258,15 @@ var BaseFileGenerator = class {
       }
     }
     if (view.filter !== void 0 && view.filter !== null) {
-      const { node } = translateNotionFilter(
+      const { node, untranslated } = translateNotionFilter(
         view.filter,
         schema,
         (id) => this.resolvePropertyName(id, schema)
       );
       if (node) result.filters = node;
+      lossyFilter = untranslated.length > 0 || node === null;
     }
-    return result;
+    return { view: result, viewId: view.id, lossyFilter };
   }
   toNoteRef(propertyName) {
     return propertyName;
@@ -15230,18 +15357,17 @@ var DbBaseFiles = class {
   get(databaseId) {
     return this.load().get(compactNotionId(databaseId));
   }
+  /** 기록한 DB 모두 — 키는 줄인 DB id. */
+  all() {
+    return [...this.load().entries()];
+  }
   set(databaseId, info) {
     const entries = this.load();
     const key = compactNotionId(databaseId);
     const known = entries.get(key);
-    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 } : {}
-    });
+    const next = normalize(info);
+    if (known && JSON.stringify(known) === JSON.stringify(next)) return;
+    entries.set(key, next);
     this.loadedRaw = JSON.stringify(Object.fromEntries(entries));
     this.stateDb.setMeta(DB_BASE_FILES_META_KEY, this.loadedRaw);
   }
@@ -15258,11 +15384,16 @@ 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,
-            ...typeof entry.hash === "string" ? { hash: entry.hash } : {}
-          });
+          this.entries.set(
+            compactNotionId(key),
+            normalize({
+              basePath: entry.basePath,
+              title: entry.title,
+              ...typeof entry.hash === "string" ? { hash: entry.hash } : {},
+              ...Array.isArray(entry.views) ? { views: entry.views } : {},
+              ...typeof entry.rest === "string" ? { rest: entry.rest } : {}
+            })
+          );
         }
       }
     } catch {
@@ -15270,182 +15401,761 @@ var DbBaseFiles = class {
     return this.entries;
   }
 };
+function normalize(info) {
+  return {
+    basePath: info.basePath,
+    title: info.title,
+    ...info.hash ? { hash: info.hash } : {},
+    ...info.views && info.views.length > 0 ? { views: info.views } : {},
+    ...info.views && info.views.length > 0 && info.rest ? { rest: info.rest } : {}
+  };
+}
 
-// src/sync/discovered-databases.ts
-var ROOT_DATABASES_FOLDER = "databases";
-var DISCOVERED_DBS_META_KEY = "discovered_dbs";
-var INACCESSIBLE_DBS_META_KEY = "inaccessible_dbs";
-var LINKED_DBS_META_KEY = "linked_dbs";
-function parseDiscoveredDbs(raw) {
-  if (!raw) return [];
+// src/sync/base-view-record.ts
+var PUSHABLE_KEYS = ["name", "order", "sort", "filters"];
+function readBaseFile(text) {
+  let doc;
   try {
-    const parsed = JSON.parse(raw);
-    return Array.isArray(parsed) ? parsed : [];
+    doc = parseFrontmatter(`---
+${text}
+---
+`).data;
   } catch {
-    return [];
+    return null;
   }
+  const views = doc["views"] ?? [];
+  if (!Array.isArray(views)) return null;
+  if (views.some((view) => !view || typeof view !== "object" || Array.isArray(view))) return null;
+  return { doc, views };
 }
-function loadInaccessibleDbIds(stateDb) {
-  const raw = stateDb.getMeta(INACCESSIBLE_DBS_META_KEY);
-  if (!raw) return /* @__PURE__ */ new Set();
-  try {
-    const arr = JSON.parse(raw);
-    return new Set(arr.map((id) => id.replace(/-/g, "")));
-  } catch {
-    return /* @__PURE__ */ new Set();
-  }
+function pushableOf(view) {
+  const order = Array.isArray(view["order"]) ? view["order"].map((c) => columnName(c)) : [];
+  const sort = Array.isArray(view["sort"]) ? view["sort"].map((s) => {
+    const entry = s ?? {};
+    return {
+      property: columnName(entry["property"]),
+      direction: String(entry["direction"] ?? "ASC").toUpperCase()
+    };
+  }) : [];
+  return {
+    name: typeof view["name"] === "string" ? view["name"] : "",
+    ...order.length > 0 ? { order } : {},
+    ...sort.length > 0 ? { sort } : {},
+    ...view["filters"] !== void 0 && view["filters"] !== null ? { filters: view["filters"] } : {}
+  };
 }
-function loadLinkedDbMap(stateDb) {
-  const raw = stateDb.getMeta(LINKED_DBS_META_KEY);
-  if (!raw) return /* @__PURE__ */ new Map();
-  try {
-    const obj = JSON.parse(raw);
-    return new Map(Object.entries(obj).map(([k, v]) => [k.replace(/-/g, ""), v.replace(/-/g, "")]));
-  } catch {
-    return /* @__PURE__ */ new Map();
-  }
+function changedFields(record, edited) {
+  const changed = [];
+  if (record.name !== edited.name) changed.push("name");
+  if (canonical(record.order) !== canonical(edited.order)) changed.push("columns");
+  if (canonical(record.sort) !== canonical(edited.sort)) changed.push("sort");
+  if (canonical(record.filters) !== canonical(edited.filters)) changed.push("filter");
+  return changed;
 }
-
-// src/sync/db-folder-moves.ts
-function rewriteDatabaseFolders(stateDb, moves) {
-  const folders = moves.filter((move) => !isMarkdownPath(move.from));
-  if (folders.length === 0) return;
-  const databases = parseDiscoveredDbs(stateDb.getMeta(DISCOVERED_DBS_META_KEY));
-  let changed = false;
-  for (const db of databases) {
-    const folder = db.localFolder.replace(/\/+$/, "");
-    const to = finalPath(folder, folders);
-    if (to === folder) continue;
-    db.localFolder = to;
-    changed = true;
-  }
-  if (changed) stateDb.setMeta(DISCOVERED_DBS_META_KEY, JSON.stringify(databases));
-  const raw = stateDb.getMeta(DB_BASE_FILES_META_KEY);
-  if (!raw) return;
-  let entries;
-  try {
-    entries = JSON.parse(raw);
-  } catch {
-    return;
-  }
-  if (!entries || typeof entries !== "object") return;
-  let moved = false;
-  for (const entry of Object.values(entries)) {
-    if (typeof entry?.basePath !== "string") continue;
-    const to = finalPath(entry.basePath, folders);
-    if (to === entry.basePath) continue;
-    entry.basePath = to;
-    moved = true;
-  }
-  if (moved) stateDb.setMeta(DB_BASE_FILES_META_KEY, JSON.stringify(entries));
+function columnName(raw) {
+  const name = String(raw ?? "");
+  return name.startsWith("note.") ? name.slice("note.".length) : name;
 }
-async function retargetBaseFiles(vaultFs, moves) {
-  const folders = moves.filter((move) => !isMarkdownPath(move.from));
-  if (folders.length === 0) return;
-  try {
-    for (const file of await vaultFs.listNonMarkdownFiles()) {
-      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_FILTER_RE, (whole, folder) => {
-        const to = finalPath(folder, folders);
-        return to === folder ? whole : inFolderFilter(to);
-      });
-      if (next !== content) await vaultFs.writeFile(file.path, next);
+function matchViews(records, views) {
+  const used = /* @__PURE__ */ new Set();
+  const out = views.map((view) => {
+    const found2 = records.find((r) => !used.has(r.viewId) && r.name === view["name"]);
+    if (found2) used.add(found2.viewId);
+    return found2;
+  });
+  views.forEach((view, i) => {
+    if (out[i]) return;
+    const record = records[i];
+    if (record && !used.has(record.viewId) && record.type === view["type"]) {
+      used.add(record.viewId);
+      out[i] = record;
     }
-  } catch (error) {
-    getLogger().warn(
-      `[Im-Nobsidian] \uC62E\uAE34 \uD3F4\uB354\uB97C \uAC00\uB9AC\uD0A4\uB358 .base \uBCF4\uAE30\uB97C \uACE0\uCE58\uC9C0 \uBABB\uD568: ${error instanceof Error ? error.message : String(error)}`
-    );
+  });
+  return out;
+}
+function restSignature(parsed, matched) {
+  const without = (from, keys) => Object.fromEntries(Object.entries(from).filter(([key]) => !keys.includes(key)));
+  const views = {};
+  parsed.views.forEach((view, i) => {
+    const key = matched[i] ? `id:${matched[i].viewId}` : `new:${String(view["name"])}`;
+    views[key] = without(view, PUSHABLE_KEYS);
+  });
+  return computeHash(canonical({ doc: without(parsed.doc, ["views"]), views }));
+}
+function viewFingerprint(view) {
+  return computeHash(
+    canonical({
+      name: view.name,
+      type: view.type,
+      filter: view.filter ?? null,
+      sorts: view.sorts ?? null,
+      configuration: view.configuration ?? null
+    })
+  );
+}
+function recordBaseViews(content, written, views) {
+  const parsed = readBaseFile(content);
+  if (!parsed || written.length !== parsed.views.length) return null;
+  const byId = new Map(views.map((view) => [view.id, view]));
+  const records = [];
+  for (const [i, source] of written.entries()) {
+    const view = byId.get(source.viewId);
+    if (!view) return null;
+    records.push({
+      viewId: source.viewId,
+      type: String(parsed.views[i]["type"]),
+      ...pushableOf(parsed.views[i]),
+      ...source.lossyFilter ? { lossyFilter: true } : {},
+      notion: viewFingerprint(view)
+    });
   }
+  return { views: records, rest: restSignature(parsed, records) };
 }
-function finalPath(path, moves) {
-  let current = path;
-  for (const move of moves) {
-    if (current === move.from || current.startsWith(`${move.from}/`)) {
-      current = move.to + current.slice(move.from.length);
-    }
+function canonical(value) {
+  return JSON.stringify(sortKeys3(value)) ?? "null";
+}
+function sortKeys3(value) {
+  if (Array.isArray(value)) return value.map(sortKeys3);
+  if (value instanceof Date) return value.toISOString();
+  if (value && typeof value === "object") {
+    return Object.fromEntries(
+      Object.keys(value).sort().map((key) => [key, sortKeys3(value[key])])
+    );
   }
-  return current;
+  return value;
 }
 
-// src/sync/note-relocation.ts
-var NoteRelocator = class {
-  constructor(stateDb, vaultFs, configuredDatabases = []) {
+// src/sync/sidecar-bases.ts
+var SIDECAR_BASES_META_KEY = "sidecar_bases";
+var SidecarBases = class {
+  constructor(stateDb) {
     this.stateDb = stateDb;
-    this.vaultFs = vaultFs;
-    this.configuredDatabases = configuredDatabases;
   }
   stateDb;
-  vaultFs;
-  configuredDatabases;
-  /**
-   * 함께 옮길 것 — 폴더로 추적하는 페이지는 그 폴더, 폴더 노트(`X/X.md`)는 든 폴더, 노트는 그 파일과 옆의 자식
-   * 폴더(`X/`, 있으면).
-   */
-  unitsOf(record) {
-    if (isFolderRecord(record)) return [record.obsidianPath];
-    if (record.fileType !== "file") return [parentFolderOf(record.obsidianPath)];
-    const children = stripMarkdownExtension(record.obsidianPath);
-    const hasChildren = this.stateDb.getAll().some((r) => within(r.obsidianPath, children));
-    return hasChildren ? [record.obsidianPath, children] : [record.obsidianPath];
+  get(databaseId) {
+    return this.load()[compactNotionId(databaseId)];
   }
-  /** 옮기지 못할 까닭 — 없으면 null. */
-  async blocked(move) {
-    if (within(move.to, move.from)) return "\uC81C \uC548\uC73C\uB85C \uC62E\uAE38 \uC218 \uC5C6\uB2E4";
-    if (!await this.vaultFs.exists(move.from)) return "\uBCFC\uD2B8\uC5D0 \uB178\uD2B8\uAC00 \uC5C6\uB2E4";
-    if (await this.taken(move.to)) return `\uC62E\uAE38 \uC790\uB9AC(${move.to})\uC5D0 \uAC19\uC740 \uC774\uB984\uC774 \uC788\uB2E4`;
-    const isFolder = !isMarkdownPath(move.from);
-    if (this.vaultFs.excludesPath?.(move.to, isFolder ? "folder" : "file")) {
-      return `\uC62E\uAE38 \uC790\uB9AC(${move.to})\uAC00 \uB3D9\uAE30\uD654\uC5D0\uC11C \uBE60\uC9C4\uB2E4(paths \xB7 .im-nobsidian-ignore)`;
+  set(databaseId, base) {
+    const all = this.load();
+    const key = compactNotionId(databaseId);
+    if (JSON.stringify(all[key]) === JSON.stringify(base)) return;
+    all[key] = base;
+    this.stateDb.setMeta(SIDECAR_BASES_META_KEY, JSON.stringify(all));
+  }
+  /** 기록한 DB 마다 — 하이픈 없는 id 와 그 기록. */
+  entries() {
+    return Object.entries(this.load());
+  }
+  load() {
+    const raw = this.stateDb.getMeta(SIDECAR_BASES_META_KEY);
+    if (!raw) return {};
+    try {
+      const parsed = JSON.parse(raw);
+      if (!parsed || typeof parsed !== "object" || Array.isArray(parsed)) return {};
+      const out = {};
+      for (const [key, value] of Object.entries(parsed)) {
+        const entry = value;
+        if (typeof entry?.path === "string" && typeof entry.hash === "string" && Array.isArray(entry.properties)) {
+          out[key] = { path: entry.path, hash: entry.hash, properties: entry.properties };
+        }
+      }
+      return out;
+    } catch {
+      return {};
     }
-    if (isFolder && this.holdsConfiguredDatabase(move.from)) {
-      return "\uD3F4\uB354 \uC548\uC5D0 \uC124\uC815 \uD30C\uC77C\uB85C \uC815\uD55C DB \uD3F4\uB354(notion.databases)\uAC00 \uC788\uB2E4 \u2014 \uC124\uC815\uC758 localFolder \uB97C \uACE0\uCE5C \uB4A4 Obsidian \uC5D0\uC11C \uC62E\uAE30\uBA74 \uB2E4\uC74C push \uAC00 Notion \uC744 \uB9DE\uCD98\uB2E4";
+  }
+};
+
+// src/sync/schema-ledger.ts
+var DB_SCHEMAS_META_KEY = "db_schemas";
+function seenSchemaOf(meta) {
+  const seen = {};
+  if (meta.dataSources.length === 0) {
+    if (Object.keys(meta.properties).length > 0) {
+      seen[compactNotionId(meta.databaseId)] = schemaOf(meta.properties);
     }
-    if (isFolder && (this.vaultFs.holdsOtherConnection?.(move.from) ?? false)) {
-      return "\uD3F4\uB354 \uC548\uC5D0 \uB2E4\uB978 \uC5F0\uACB0 \uD3F4\uB354\uAC00 \uC788\uB2E4 \u2014 Obsidian \uC5D0\uC11C \uC62E\uAE30\uBA74 \uB2E4\uC74C push \uAC00 Notion \uC744 \uB9DE\uCD98\uB2E4";
+  } else {
+    for (const ds of meta.dataSources) {
+      if (ds.properties) seen[compactNotionId(ds.id)] = schemaOf(ds.properties);
     }
-    return null;
   }
-  /** 이 경로에 파일 · 폴더가 있거나 추적하는 것이 있다. */
-  async taken(path) {
-    return await this.vaultFs.exists(path) || this.stateDb.getAll().some((r) => within(r.obsidianPath, path));
+  return Object.keys(seen).length > 0 ? seen : null;
+}
+function dataSourceIdOf(page) {
+  const parent = page.parent;
+  return parent?.type === "data_source_id" && parent.data_source_id ? parent.data_source_id : null;
+}
+function sourceKeyOf(page, databaseId) {
+  return compactNotionId(dataSourceIdOf(page) ?? databaseId);
+}
+function schemaOf(properties) {
+  const schema = {};
+  for (const [name, raw] of Object.entries(properties)) {
+    const prop = raw;
+    if (typeof prop?.["id"] !== "string" || typeof prop["type"] !== "string") continue;
+    if (prop["type"] === "title") continue;
+    const values = valuesOf(prop["type"], prop[prop["type"]]);
+    schema[prop["id"]] = { name, type: prop["type"], ...values ? { values } : {} };
+  }
+  return schema;
+}
+function valuesOf(type, config) {
+  const c = config ?? {};
+  let decides;
+  if (type === "select" || type === "multi_select" || type === "status") {
+    const options = Array.isArray(c["options"]) ? c["options"] : [];
+    decides = options.map((o) => String(o?.name ?? "")).sort();
+  } else if (type === "formula") {
+    decides = c["expression"] ?? null;
+  } else if (type === "rollup") {
+    decides = [c["relation_property_id"], c["rollup_property_id"], c["function"]];
+  } else {
+    return void 0;
   }
-  /**
-   * 차례로 옮기고 상태 DB 를 새 경로로 적는다. 하나라도 실패하면 옮긴 것을 되돌리고 던진다 — 상태 DB 는 옛 경로 그대로다.
-   * @param alsoInTransaction 경로를 옮겨 적는 트랜잭션 안에서 함께 할 것.
-   */
-  async relocate(moves, alsoInTransaction) {
-    const done = [];
-    try {
-      for (const move of moves) {
-        await this.vaultFs.moveFile(move.from, move.to);
-        done.push(move);
+  return computeHash(JSON.stringify(decides)).slice(0, 16);
+}
+function diffSourceSchema(before, after) {
+  const renamed = /* @__PURE__ */ new Map();
+  const removed = /* @__PURE__ */ new Set();
+  const refreshed = /* @__PURE__ */ new Set();
+  const withEnd = (name, type) => mayHaveRangeEnd(type) ? [name, name + RANGE_END_SUFFIX] : [name];
+  for (const [id, old] of Object.entries(before)) {
+    const now = after[id];
+    if (!now) {
+      for (const key of withEnd(old.name, old.type)) removed.add(key);
+      continue;
+    }
+    if (now.name !== old.name) {
+      renamed.set(old.name, now.name);
+      if (mayHaveRangeEnd(old.type) && mayHaveRangeEnd(now.type)) {
+        renamed.set(old.name + RANGE_END_SUFFIX, now.name + RANGE_END_SUFFIX);
       }
-    } catch (error) {
-      for (const move of done.reverse())
-        await this.vaultFs.moveFile(move.to, move.from).catch(() => {
-        });
-      throw error;
     }
-    this.stateDb.transaction(() => {
-      for (const move of moves) this.rewritePaths(move);
-      rewriteDatabaseFolders(this.stateDb, moves);
-      alsoInTransaction?.();
-    });
-    await retargetBaseFiles(this.vaultFs, moves);
+    const revalued = old.values !== void 0 && now.values !== void 0 && old.values !== now.values;
+    if (now.type !== old.type || revalued) {
+      for (const key of withEnd(now.name, now.type)) refreshed.add(key);
+    }
   }
-  holdsConfiguredDatabase(folder) {
-    return this.configuredDatabases.some(
-      (db) => within(db.localFolder.replace(/\/+$/, ""), folder)
-    );
+  for (const [id, now] of Object.entries(after)) {
+    if (!before[id]) for (const key of withEnd(now.name, now.type)) refreshed.add(key);
   }
-  /** 옮긴 것 아래의 레코드 · 위키링크 · 보존 마커 · 첨부 기록을 새 경로로 옮겨 적는다. */
-  rewritePaths(move) {
-    for (const record of this.stateDb.getAll()) {
-      if (!within(record.obsidianPath, move.from)) continue;
-      const from = record.obsidianPath;
-      const to = move.to + from.slice(move.from.length);
+  return { renamed, removed, refreshed };
+}
+function isEmptySchemaChange(change) {
+  return change.renamed.size === 0 && change.removed.size === 0 && change.refreshed.size === 0;
+}
+var SchemaLedger = class {
+  constructor(stateDb) {
+    this.stateDb = stateDb;
+  }
+  stateDb;
+  get(databaseId) {
+    return this.load()[compactNotionId(databaseId)];
+  }
+  /** 이번에 본 소스로 바꾼다 — 이번에 읽지 못한 소스는 지난번 것을 둔다. */
+  set(databaseId, seen) {
+    const all = this.load();
+    const key = compactNotionId(databaseId);
+    const next = { ...all[key], ...seen };
+    if (JSON.stringify(all[key]) === JSON.stringify(next)) return;
+    all[key] = next;
+    this.stateDb.setMeta(DB_SCHEMAS_META_KEY, JSON.stringify(all));
+  }
+  load() {
+    const raw = this.stateDb.getMeta(DB_SCHEMAS_META_KEY);
+    if (!raw) return {};
+    try {
+      const parsed = JSON.parse(raw);
+      return parsed && typeof parsed === "object" && !Array.isArray(parsed) ? parsed : {};
+    } catch {
+      return {};
+    }
+  }
+};
+
+// src/sync/sidecar-schema-edit.ts
+var DEFINABLE_TYPES = /* @__PURE__ */ new Set([
+  "formula",
+  "number",
+  "select",
+  "multi_select"
+]);
+var SidecarSchemaEdits = class {
+  constructor(stateDb, vaultFs, notionClient) {
+    this.vaultFs = vaultFs;
+    this.notionClient = notionClient;
+    this.bases = new SidecarBases(stateDb);
+    this.ledger = new SchemaLedger(stateDb);
+  }
+  vaultFs;
+  notionClient;
+  bases;
+  ledger;
+  /** 고친 사이드카를 찾아 보낼 것을 정한다 — Notion 은 고친 것의 DB 만 읽는다. */
+  async plan(inScope = () => true) {
+    const planned = [];
+    const refused = [];
+    const refuse2 = (path, error) => {
+      refused.push({
+        path,
+        operation: "update",
+        error: `\uC0AC\uC774\uB4DC\uCE74\uB97C Notion \uC5D0 \uC62C\uB9AC\uC9C0 \uC54A\uC558\uC2B5\uB2C8\uB2E4 \u2014 ${error}`
+      });
+    };
+    for (const [databaseId, base] of this.bases.entries()) {
+      if (!inScope(base.path)) continue;
+      const content = await this.vaultFs.readFile(base.path).catch(() => null);
+      if (content === null) continue;
+      const hash = computeHash(content);
+      if (hash === base.hash) continue;
+      let edited;
+      try {
+        edited = JSON.parse(content);
+      } catch {
+        refuse2(base.path, "JSON \uC73C\uB85C \uC77D\uC744 \uC218 \uC5C6\uC2B5\uB2C8\uB2E4");
+        continue;
+      }
+      const sidecar = edited;
+      if (sidecar.generator !== SIDECAR_GENERATOR) continue;
+      if (typeof sidecar.databaseId !== "string" || compactNotionId(sidecar.databaseId) !== databaseId) {
+        refuse2(base.path, "databaseId \uB97C \uBC14\uAFC0 \uC218 \uC5C6\uC2B5\uB2C8\uB2E4");
+        continue;
+      }
+      const properties = parseProperties(sidecar.properties);
+      if (properties === null) {
+        refuse2(base.path, "properties \uB294 name \xB7 type \uC774 \uC788\uB294 \uD56D\uBAA9\uC758 \uBAA9\uB85D\uC774\uC5B4\uC57C \uD569\uB2C8\uB2E4");
+        continue;
+      }
+      const diff = diffSidecarProperties(base.properties, properties);
+      if (!diff.ok) {
+        refuse2(base.path, diff.error);
+        continue;
+      }
+      if (Object.keys(diff.payload).length === 0) continue;
+      const meta = await this.notionClient.getDatabaseMeta(databaseId);
+      if (meta.dataSources.length !== 1) {
+        refuse2(
+          base.path,
+          "\uB370\uC774\uD130 \uC18C\uC2A4\uAC00 \uC5EC\uB7FF\uC778 DB \uC758 \uC18D\uC131\uC740 \uC0AC\uC774\uB4DC\uCE74\uB85C \uBC14\uAFB8\uC9C0 \uC54A\uC2B5\uB2C8\uB2E4. Notion \uC5D0\uC11C \uBC14\uAFB8\uC138\uC694"
+        );
+        continue;
+      }
+      const source = meta.dataSources[0];
+      const live = source.properties ?? meta.properties;
+      if (!sameSchema(base.properties, live)) {
+        refuse2(
+          base.path,
+          "\uADF8 \uC0AC\uC774 Notion \uC5D0\uC11C\uB3C4 \uC18D\uC131\uC774 \uBC14\uB00C\uC5C8\uC2B5\uB2C8\uB2E4. \uACE0\uCE5C \uB0B4\uC6A9\uC744 \uC62E\uACA8 \uC801\uACE0 \uC774 \uD30C\uC77C\uC744 \uC9C0\uC6B4 \uB4A4 pull \uD558\uBA74 \uC0C8\uB85C \uBC1B\uC2B5\uB2C8\uB2E4"
+        );
+        continue;
+      }
+      planned.push({
+        databaseId,
+        dataSourceId: source.id,
+        path: base.path,
+        hash,
+        properties,
+        payload: diff.payload,
+        edit: { path: base.path, ...diff.edit },
+        seen: this.ledger.get(databaseId) ? null : seenSchemaOf(meta)
+      });
+    }
+    return { planned, refused };
+  }
+  async apply(planned) {
+    const applied = [];
+    const failed = [];
+    for (const edit of planned) {
+      if (edit.seen) this.ledger.set(edit.databaseId, edit.seen);
+      let after;
+      try {
+        after = await this.notionClient.updateDataSourceProperties(edit.dataSourceId, edit.payload);
+      } catch (error) {
+        failed.push({
+          path: edit.path,
+          operation: "update",
+          error: `\uC0AC\uC774\uB4DC\uCE74\uC758 \uC18D\uC131\uC744 Notion \uC5D0 \uC62C\uB9AC\uC9C0 \uBABB\uD588\uC2B5\uB2C8\uB2E4: ${error instanceof Error ? error.message : String(error)}`
+        });
+        continue;
+      }
+      this.bases.set(edit.databaseId, {
+        path: edit.path,
+        hash: edit.hash,
+        properties: edit.properties.map((prop) => {
+          const id = prop.id ?? after[prop.name]?.["id"];
+          return typeof id === "string" ? { ...prop, id } : prop;
+        })
+      });
+      applied.push(edit.edit);
+    }
+    return { applied, failed };
+  }
+};
+function sidecarPropertiesEdited(content, base) {
+  let parsed;
+  try {
+    parsed = JSON.parse(content);
+  } catch {
+    return true;
+  }
+  const properties = parseProperties(parsed.properties);
+  if (properties === null) return true;
+  const diff = diffSidecarProperties(base.properties, properties);
+  return !diff.ok || Object.keys(diff.payload).length > 0;
+}
+function parseProperties(value) {
+  if (!Array.isArray(value)) return null;
+  const out = [];
+  for (const item of value) {
+    const prop = item;
+    if (!prop || typeof prop !== "object" || typeof prop.name !== "string" || prop.name.trim() === "" || typeof prop.type !== "string" || prop.id !== void 0 && typeof prop.id !== "string" || prop.options !== void 0 && !(Array.isArray(prop.options) && prop.options.every((o) => typeof o === "string")) || prop.definition !== void 0 && (typeof prop.definition !== "object" || prop.definition === null || Array.isArray(prop.definition))) {
+      return null;
+    }
+    out.push(prop);
+  }
+  return out;
+}
+function diffSidecarProperties(base, edited) {
+  const fail = (error) => ({ ok: false, error });
+  const byId = new Map(base.map((prop) => [prop.id, prop]));
+  const payload = {};
+  const edit = {
+    added: [],
+    removed: [],
+    renamed: [],
+    retyped: [],
+    redefined: []
+  };
+  const droppedOptions = [];
+  const names = /* @__PURE__ */ new Set();
+  const seenIds = /* @__PURE__ */ new Set();
+  for (const prop of edited) {
+    if (names.has(prop.name)) return fail(`\uC18D\uC131 \uC774\uB984 \u300C${prop.name}\u300D \uC774 \uB458\uC785\uB2C8\uB2E4`);
+    names.add(prop.name);
+    const old = prop.id === void 0 ? void 0 : byId.get(prop.id);
+    if (prop.id !== void 0 && !old) {
+      return fail(`\u300C${prop.name}\u300D \uC758 id \uB97C \uBAA8\uB985\uB2C8\uB2E4 \u2014 \uC0C8 \uC18D\uC131\uC740 id \uB97C \uC801\uC9C0 \uB9C8\uC138\uC694`);
+    }
+    if (old && seenIds.has(old.id)) return fail(`\u300C${prop.name}\u300D \uC758 id \uAC00 \uB458\uC785\uB2C8\uB2E4`);
+    if (!old) {
+      if (prop.type === "title") return fail("\uC81C\uBAA9 \uC18D\uC131\uC740 \uB354\uD560 \uC218 \uC5C6\uC2B5\uB2C8\uB2E4");
+      payload[prop.name] = { [prop.type]: definitionOf(prop, void 0) };
+      edit.added.push(prop.name);
+      continue;
+    }
+    seenIds.add(old.id);
+    const change = {};
+    if (prop.name !== old.name) {
+      change["name"] = prop.name;
+      edit.renamed.push([old.name, prop.name]);
+    }
+    if (prop.type !== old.type) {
+      if (old.type === "title" || prop.type === "title") {
+        return fail("\uC81C\uBAA9 \uC18D\uC131\uC758 \uD0C0\uC785\uC740 \uBC14\uAFC0 \uC218 \uC5C6\uC2B5\uB2C8\uB2E4");
+      }
+      change[prop.type] = definitionOf(prop, void 0);
+      edit.retyped.push([prop.name, prop.type]);
+    } else if (!sameDefinition(prop, old)) {
+      if (!DEFINABLE_TYPES.has(prop.type)) {
+        return fail(
+          `\u300C${prop.name}\u300D(${prop.type}) \uC758 \uC124\uC815\uC740 \uC0AC\uC774\uB4DC\uCE74\uC5D0\uC11C \uBC14\uAFC0 \uC218 \uC5C6\uC2B5\uB2C8\uB2E4. Notion \uC5D0\uC11C \uBC14\uAFB8\uC138\uC694`
+        );
+      }
+      change[prop.type] = definitionOf(prop, old);
+      edit.redefined.push(prop.name);
+      const dropped = (old.options ?? []).filter((name) => !(prop.options ?? []).includes(name));
+      if (dropped.length > 0) droppedOptions.push([prop.name, dropped]);
+    }
+    if (Object.keys(change).length > 0) payload[old.id] = change;
+  }
+  for (const old of base) {
+    if (seenIds.has(old.id)) continue;
+    if (old.type === "title") return fail("\uC81C\uBAA9 \uC18D\uC131\uC740 \uC9C0\uC6B8 \uC218 \uC5C6\uC2B5\uB2C8\uB2E4");
+    payload[old.id] = null;
+    edit.removed.push(old.name);
+  }
+  const kept = base.filter((p) => p.type !== "title").length;
+  if (kept >= 2 && edit.removed.length === kept && edit.added.length === 0) {
+    return fail("\uC81C\uBAA9 \uB9D0\uACE0 \uBAA8\uB4E0 \uC18D\uC131\uC744 \uC9C0\uC6B0\uB294 \uAC83\uC740 \uBC1B\uC9C0 \uC54A\uC2B5\uB2C8\uB2E4 \u2014 \uC815\uB9D0\uC774\uBA74 Notion \uC5D0\uC11C \uC9C0\uC6B0\uC138\uC694");
+  }
+  return {
+    ok: true,
+    payload,
+    edit: droppedOptions.length > 0 ? { ...edit, droppedOptions } : edit
+  };
+}
+function definitionOf(prop, old) {
+  if (!DEFINABLE_TYPES.has(prop.type)) return {};
+  const definition = prop.definition ?? {};
+  if (old && (prop.type === "select" || prop.type === "multi_select") && sameJson(prop.definition, old.definition) && !sameJson(prop.options, old.options)) {
+    const known = old.definition?.["options"] ?? [];
+    return {
+      options: (prop.options ?? []).map((name) => known.find((o) => o.name === name) ?? { name })
+    };
+  }
+  return definition;
+}
+function sameDefinition(a, b) {
+  return sameJson(a.definition, b.definition) && sameJson(a.options, b.options);
+}
+function sameSchema(base, live) {
+  const liveById = /* @__PURE__ */ new Map();
+  for (const [name, raw] of Object.entries(live)) {
+    const prop = raw;
+    if (typeof prop?.id === "string") liveById.set(prop.id, { name, type: prop.type });
+  }
+  return liveById.size === base.length && base.every((prop) => {
+    const now = liveById.get(prop.id);
+    return now?.name === prop.name && now.type === prop.type;
+  });
+}
+function sameJson(a, b) {
+  return JSON.stringify(sortKeys4(a)) === JSON.stringify(sortKeys4(b));
+}
+function sortKeys4(value) {
+  if (Array.isArray(value)) return value.map(sortKeys4);
+  if (value !== null && typeof value === "object") {
+    return Object.fromEntries(
+      Object.keys(value).sort().map((key) => [key, sortKeys4(value[key])])
+    );
+  }
+  return value;
+}
+
+// src/sync/schema-follow.ts
+async function rekeyTrackedRows(stateDb, vaultFs, databaseId, pages, changes, soleSource) {
+  const sourceOf = new Map(
+    pages.map((page) => [normalizeNotionId(page.id), sourceKeyOf(page, databaseId)])
+  );
+  const rewritten = [];
+  let failed = 0;
+  const kept = [];
+  for (const record of stateDb.getAll()) {
+    if (record.fileType !== "db-row" || record.notionPageId === null || record.notionParentId === null || !notionIdsEqual(record.notionParentId, databaseId) || (vaultFs.excludesPath?.(record.obsidianPath) ?? false)) {
+      continue;
+    }
+    const source = sourceOf.get(normalizeNotionId(record.notionPageId)) ?? soleSource;
+    const change = source === null ? void 0 : changes.get(source);
+    if (!change || change.renamed.size === 0 && change.removed.size === 0) continue;
+    try {
+      const outcome = await rekeyRow(stateDb, vaultFs, record, change);
+      if (outcome.wrote) rewritten.push(record.id);
+      kept.push(...outcome.kept.map((key) => ({ path: record.obsidianPath, key })));
+    } catch {
+      failed++;
+    }
+  }
+  return { rewritten, kept, failed };
+}
+async function rekeyRow(stateDb, vaultFs, record, change) {
+  if (!await vaultFs.exists(record.obsidianPath)) return { wrote: false, kept: [] };
+  const local = await vaultFs.readFile(record.obsidianPath);
+  const snapshot = record.baseSnapshot ? record.baseSnapshot.toString("utf-8") : null;
+  const base = snapshotFrontmatter(record.baseSnapshot);
+  const unmodified = computeHash(local) === record.contentHash;
+  const kept = [];
+  const dropLocal = (key, value) => {
+    if (!change.removed.has(key)) return false;
+    if (unmodified || base !== null && sameFrontmatterValue(plainFrontmatterValue(base[key]), value)) {
+      return true;
+    }
+    kept.push(key);
+    return false;
+  };
+  const nextLocal = rekeyed(local, change, dropLocal);
+  const nextSnapshot = snapshot === null ? null : rekeyed(snapshot, change, (key) => change.removed.has(key));
+  if (nextLocal === null && nextSnapshot === null) return { wrote: false, kept };
+  if (nextLocal !== null) await vaultFs.writeFile(record.obsidianPath, nextLocal);
+  const synced = unmodified ? nextLocal ?? local : nextSnapshot ?? snapshot;
+  const stat2 = unmodified && nextLocal !== null ? await vaultFs.getFileStat(record.obsidianPath) : null;
+  if (synced !== null) {
+    stateDb.transaction(() => {
+      stateDb.updateHash(record.id, computeHash(synced), Buffer.from(synced, "utf-8"));
+      if (stat2) stateDb.updateStatCache(record.id, stat2.mtime, stat2.size);
+    });
+  }
+  return { wrote: nextLocal !== null, kept };
+}
+function rekeyed(note, change, dropped) {
+  const lines = rekeyRowFrontmatter(note, change.renamed, dropped);
+  return lines === null ? null : replaceFrontmatterLines(note, lines);
+}
+
+// src/sync/discovered-databases.ts
+var ROOT_DATABASES_FOLDER = "databases";
+var DISCOVERED_DBS_META_KEY = "discovered_dbs";
+var INACCESSIBLE_DBS_META_KEY = "inaccessible_dbs";
+var LINKED_DBS_META_KEY = "linked_dbs";
+function parseDiscoveredDbs(raw) {
+  if (!raw) return [];
+  try {
+    const parsed = JSON.parse(raw);
+    return Array.isArray(parsed) ? parsed : [];
+  } catch {
+    return [];
+  }
+}
+function loadInaccessibleDbIds(stateDb) {
+  const raw = stateDb.getMeta(INACCESSIBLE_DBS_META_KEY);
+  if (!raw) return /* @__PURE__ */ new Set();
+  try {
+    const arr = JSON.parse(raw);
+    return new Set(arr.map((id) => id.replace(/-/g, "")));
+  } catch {
+    return /* @__PURE__ */ new Set();
+  }
+}
+function loadLinkedDbMap(stateDb) {
+  const raw = stateDb.getMeta(LINKED_DBS_META_KEY);
+  if (!raw) return /* @__PURE__ */ new Map();
+  try {
+    const obj = JSON.parse(raw);
+    return new Map(Object.entries(obj).map(([k, v]) => [k.replace(/-/g, ""), v.replace(/-/g, "")]));
+  } catch {
+    return /* @__PURE__ */ new Map();
+  }
+}
+
+// src/sync/db-folder-moves.ts
+function rewriteDatabaseFolders(stateDb, moves) {
+  const folders = moves.filter((move) => !isMarkdownPath(move.from));
+  if (folders.length === 0) return;
+  const databases = parseDiscoveredDbs(stateDb.getMeta(DISCOVERED_DBS_META_KEY));
+  let changed = false;
+  for (const db of databases) {
+    const folder = db.localFolder.replace(/\/+$/, "");
+    const to = finalPath(folder, folders);
+    if (to === folder) continue;
+    db.localFolder = to;
+    changed = true;
+  }
+  if (changed) stateDb.setMeta(DISCOVERED_DBS_META_KEY, JSON.stringify(databases));
+  const raw = stateDb.getMeta(DB_BASE_FILES_META_KEY);
+  if (!raw) return;
+  let entries;
+  try {
+    entries = JSON.parse(raw);
+  } catch {
+    return;
+  }
+  if (!entries || typeof entries !== "object") return;
+  let moved = false;
+  for (const entry of Object.values(entries)) {
+    if (typeof entry?.basePath !== "string") continue;
+    const to = finalPath(entry.basePath, folders);
+    if (to === entry.basePath) continue;
+    entry.basePath = to;
+    moved = true;
+  }
+  if (moved) stateDb.setMeta(DB_BASE_FILES_META_KEY, JSON.stringify(entries));
+}
+async function retargetBaseFiles(vaultFs, moves) {
+  const folders = moves.filter((move) => !isMarkdownPath(move.from));
+  if (folders.length === 0) return;
+  try {
+    for (const file of await vaultFs.listNonMarkdownFiles()) {
+      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_FILTER_RE, (whole, folder) => {
+        const to = finalPath(folder, folders);
+        return to === folder ? whole : inFolderFilter(to);
+      });
+      if (next !== content) await vaultFs.writeFile(file.path, next);
+    }
+  } catch (error) {
+    getLogger().warn(
+      `[Im-Nobsidian] \uC62E\uAE34 \uD3F4\uB354\uB97C \uAC00\uB9AC\uD0A4\uB358 .base \uBCF4\uAE30\uB97C \uACE0\uCE58\uC9C0 \uBABB\uD568: ${error instanceof Error ? error.message : String(error)}`
+    );
+  }
+}
+function finalPath(path, moves) {
+  let current = path;
+  for (const move of moves) {
+    if (current === move.from || current.startsWith(`${move.from}/`)) {
+      current = move.to + current.slice(move.from.length);
+    }
+  }
+  return current;
+}
+
+// src/sync/note-relocation.ts
+var NoteRelocator = class {
+  constructor(stateDb, vaultFs, configuredDatabases = []) {
+    this.stateDb = stateDb;
+    this.vaultFs = vaultFs;
+    this.configuredDatabases = configuredDatabases;
+  }
+  stateDb;
+  vaultFs;
+  configuredDatabases;
+  /**
+   * 함께 옮길 것 — 폴더로 추적하는 페이지는 그 폴더, 폴더 노트(`X/X.md`)는 든 폴더, 노트는 그 파일과 옆의 자식
+   * 폴더(`X/`, 있으면).
+   */
+  unitsOf(record) {
+    if (isFolderRecord(record)) return [record.obsidianPath];
+    if (record.fileType !== "file") return [parentFolderOf(record.obsidianPath)];
+    const children = stripMarkdownExtension(record.obsidianPath);
+    const hasChildren = this.stateDb.getAll().some((r) => within(r.obsidianPath, children));
+    return hasChildren ? [record.obsidianPath, children] : [record.obsidianPath];
+  }
+  /** 옮기지 못할 까닭 — 없으면 null. */
+  async blocked(move) {
+    if (within(move.to, move.from)) return "\uC81C \uC548\uC73C\uB85C \uC62E\uAE38 \uC218 \uC5C6\uB2E4";
+    if (!await this.vaultFs.exists(move.from)) return "\uBCFC\uD2B8\uC5D0 \uB178\uD2B8\uAC00 \uC5C6\uB2E4";
+    if (await this.taken(move.to)) return `\uC62E\uAE38 \uC790\uB9AC(${move.to})\uC5D0 \uAC19\uC740 \uC774\uB984\uC774 \uC788\uB2E4`;
+    const isFolder = !isMarkdownPath(move.from);
+    if (this.vaultFs.excludesPath?.(move.to, isFolder ? "folder" : "file")) {
+      return `\uC62E\uAE38 \uC790\uB9AC(${move.to})\uAC00 \uB3D9\uAE30\uD654\uC5D0\uC11C \uBE60\uC9C4\uB2E4(paths \xB7 .im-nobsidian-ignore)`;
+    }
+    if (isFolder && this.holdsConfiguredDatabase(move.from)) {
+      return "\uD3F4\uB354 \uC548\uC5D0 \uC124\uC815 \uD30C\uC77C\uB85C \uC815\uD55C DB \uD3F4\uB354(notion.databases)\uAC00 \uC788\uB2E4 \u2014 \uC124\uC815\uC758 localFolder \uB97C \uACE0\uCE5C \uB4A4 Obsidian \uC5D0\uC11C \uC62E\uAE30\uBA74 \uB2E4\uC74C push \uAC00 Notion \uC744 \uB9DE\uCD98\uB2E4";
+    }
+    if (isFolder && (this.vaultFs.holdsOtherConnection?.(move.from) ?? false)) {
+      return "\uD3F4\uB354 \uC548\uC5D0 \uB2E4\uB978 \uC5F0\uACB0 \uD3F4\uB354\uAC00 \uC788\uB2E4 \u2014 Obsidian \uC5D0\uC11C \uC62E\uAE30\uBA74 \uB2E4\uC74C push \uAC00 Notion \uC744 \uB9DE\uCD98\uB2E4";
+    }
+    return null;
+  }
+  /** 이 경로에 파일 · 폴더가 있거나 추적하는 것이 있다. */
+  async taken(path) {
+    return await this.vaultFs.exists(path) || this.stateDb.getAll().some((r) => within(r.obsidianPath, path));
+  }
+  /**
+   * 차례로 옮기고 상태 DB 를 새 경로로 적는다. 하나라도 실패하면 옮긴 것을 되돌리고 던진다 — 상태 DB 는 옛 경로 그대로다.
+   * @param alsoInTransaction 경로를 옮겨 적는 트랜잭션 안에서 함께 할 것.
+   */
+  async relocate(moves, alsoInTransaction) {
+    const done = [];
+    try {
+      for (const move of moves) {
+        await this.vaultFs.moveFile(move.from, move.to);
+        done.push(move);
+      }
+    } catch (error) {
+      for (const move of done.reverse())
+        await this.vaultFs.moveFile(move.to, move.from).catch(() => {
+        });
+      throw error;
+    }
+    this.stateDb.transaction(() => {
+      for (const move of moves) this.rewritePaths(move);
+      rewriteDatabaseFolders(this.stateDb, moves);
+      alsoInTransaction?.();
+    });
+    await retargetBaseFiles(this.vaultFs, moves);
+  }
+  holdsConfiguredDatabase(folder) {
+    return this.configuredDatabases.some(
+      (db) => within(db.localFolder.replace(/\/+$/, ""), folder)
+    );
+  }
+  /** 옮긴 것 아래의 레코드 · 위키링크 · 보존 마커 · 첨부 기록을 새 경로로 옮겨 적는다. */
+  rewritePaths(move) {
+    for (const record of this.stateDb.getAll()) {
+      if (!within(record.obsidianPath, move.from)) continue;
+      const from = record.obsidianPath;
+      const to = move.to + from.slice(move.from.length);
       this.stateDb.updatePath(record.id, to);
       const entry = record.notionPageId ? this.stateDb.resolvePageId(record.notionPageId) : null;
       if (entry && entry.obsidianPath === from) {
@@ -15896,6 +16606,8 @@ var DatabaseSyncer = class {
     this.observation = observation;
     this.noteRowBody = noteRowBody;
     this.baseFileInfo = new DbBaseFiles(stateDb);
+    this.sidecarBases = new SidecarBases(stateDb);
+    this.schemaLedger = new SchemaLedger(stateDb);
     this.relocator = new NoteRelocator(stateDb, vaultFs, config.notion.databases ?? []);
     this.propertyMapper = PropertyMapper.fromConfig(config);
     this.propertyMapper.setWikilinkResolver({
@@ -15935,11 +16647,21 @@ var DatabaseSyncer = class {
   };
   /** 볼트에서 사라져 되살린 행의 경로 — pull 마감이 가져가 화면에 알린다(D8). */
   restoredRows = [];
+  /** Notion 에서 바뀐 속성을 행 노트에 옮긴 것 — pull 마감이 가져가 화면에 알린다(ADR-045). */
+  schemaFollowed = [];
+  /** pull 이 마지막으로 쓴 사이드카 — 볼트에서 고친 것은 덮어쓰지 않는다(ADR-045). */
+  sidecarBases;
+  /** 이번 pull 이 고쳐 둔 것이라 덮어쓰지 않은 사이드카 경로. */
+  heldSidecars = /* @__PURE__ */ new Set();
+  /** 이번 pull 이 볼트에서 고친 것이라 덮어쓰지 않은 `.base` 경로(ADR-046). */
+  heldBases = /* @__PURE__ */ new Set();
   /**
    * 실제로 기록한 .base 경로/DB 제목 — placeholder 임베드 재작성(F22)의 SSOT. 이번 pull 이 조회하지
    * 않은 DB 의 것도 남아 있다({@link DbBaseFiles}).
    */
   baseFileInfo;
+  /** DB 마다 지난 pull 이 본 속성 — Notion 에서 바꾼 속성 이름을 행 노트에 옮기는 근거(ADR-045). */
+  schemaLedger;
   get decorations() {
     return this.decorationsCache ??= new PageDecorations(this.notionClient, this.imageHandler);
   }
@@ -16005,12 +16727,14 @@ var DatabaseSyncer = class {
     const schema = await this.notionClient.getDatabaseSchema(dbConfig.databaseId, meta);
     this.propertyMapper.loadSchema(schema);
     await this.vaultFs.ensureFolder(dbConfig.localFolder);
+    const followed = wholeDbInScope ? await this.followSchema(dbConfig, meta, pages) : { changes: /* @__PURE__ */ new Map(), rekeyed: /* @__PURE__ */ new Set() };
+    const refreshedKeys = (page) => followed.changes.get(sourceKeyOf(page, dbConfig.databaseId))?.refreshed;
     if (wholeDbInScope) {
       const viewsConfig = await this.pullDatabaseViews(dbConfig);
       await this.generateBaseFile(dbConfig, viewsConfig, meta, void 0, this.rangeEndsOf(pages));
     }
     let created = 0;
-    let updated = 0;
+    let updated = followed.rekeyed.size;
     let restored = 0;
     const conflicts = [];
     const failed = [];
@@ -16025,7 +16749,14 @@ var DatabaseSyncer = class {
     for (const page of pages) {
       try {
         const record = this.stateDb.getByNotionId(page.id);
-        const action = await this.rowAction(dbConfig, page, record, wholeDbInScope, scope);
+        const action = await this.rowAction(
+          dbConfig,
+          page,
+          record,
+          wholeDbInScope,
+          scope,
+          refreshedKeys(page)
+        );
         if (action !== "skip") pending.push({ page, action });
         else if (record && (wholeDbInScope || inAnyPathScope(record.obsidianPath, scope))) {
           unchanged.push(page);
@@ -16044,7 +16775,7 @@ var DatabaseSyncer = class {
       try {
         const record = this.stateDb.getByNotionId(page.id);
         const outcome = await withDeadline(
-          () => action === "reform" && record ? this.rewriteDateForms(page, record) : this.pullDatabasePage(page, dbConfig),
+          () => action === "reform" && record ? this.rewriteStaleKeys(page, record, refreshedKeys(page)) : this.pullDatabasePage(page, dbConfig),
           this.config.advanced.itemTimeoutMs,
           `pull ${dbConfig.localFolder}/${page.id}`
         );
@@ -16055,7 +16786,7 @@ var DatabaseSyncer = class {
           if (action === "restore") {
             restored++;
             this.restoredRows.push(outcome.path);
-          } else updated++;
+          } else if (!followed.rekeyed.has(record.id)) updated++;
           writtenPaths.push(outcome.path);
         } else if (outcome.action === "conflict") {
           conflicts.push(outcome.conflict);
@@ -16218,32 +16949,35 @@ var DatabaseSyncer = class {
    *    (틀린) 전제로 db-row 를 제외해 두었기에 양쪽 어디에도 복원 경로가 없는 상태였다.
    *    deleteSync 가 켜져 있으면 되살리지 않는다 — 지운 것은 Notion 에서도 지우라는 뜻이고, sync 는
    *    pull 을 먼저 돌려 되살리면 뒤이은 push 가 지울 것을 잃는다(detectMissingLocalFiles 와 같다).
-   *  · 예전 버전이 적은 날짜 모양이 남은 행은 그 줄만 새 모양으로 고쳐 쓴다({@link outdatedDateForm},
-   *    F-08).
+   *  · 예전 버전이 적은 날짜 모양이 남은 행, Notion 이 새로 만들거나 타입을 바꾼 속성의 값이 다른 행은 그 줄만
+   *    고쳐 쓴다({@link staleKeysToRewrite}, F-08 · ADR-045).
+   *
+   * @param refreshed 이 행의 data source 에서 새로 생기거나 타입이 바뀐 속성의 키(ADR-045).
    */
-  async rowAction(dbConfig, page, record, wholeDbInScope, scope) {
+  async rowAction(dbConfig, page, record, wholeDbInScope, scope, refreshed) {
     if (!wholeDbInScope && !(record && inAnyPathScope(record.obsidianPath, scope))) return "skip";
     if (record && this.vaultFs.excludesPath?.(record.obsidianPath)) return "skip";
     if (!record) return "pull";
     const misplaced = !isDirectDbRowPath(dbConfig.localFolder, record.obsidianPath);
     const changed = misplaced || this.remoteVerdict(record, page) !== "unchanged";
-    if (!changed && await this.outdatedDateForm(record, page)) return "reform";
+    if (!changed && await this.staleKeysToRewrite(record, page, refreshed)) return "reform";
     if (this.config.sync.deleteSync || await this.vaultFs.exists(record.obsidianPath)) {
       return changed ? "pull" : "skip";
     }
     return "restore";
   }
   /**
-   * 원격이 그대로인 행이지만 예전 버전이 적은 날짜 모양(`…Z` · `…+09:00` · `{start, end}`)이 남아 새
-   * 모양으로 고쳐 쓸 행인가(F-08, {@link PropertyMapper.outdatedDateKeys}). 고쳐 쓰면 사본도 새 모양이
-   * 되어 다음 pull 은 건너뛴다.
+   * 원격이 그대로인 행이지만 그 줄만 고쳐 쓸 키가 있는가 — 예전 버전이 적은 날짜 모양(`…Z` · `…+09:00` ·
+   * `{start, end}`, F-08, {@link PropertyMapper.outdatedDateKeys}), 또는 Notion 이 새로 만들거나 타입을 바꾼
+   * 속성의 값이 적힌 것과 다른 키(ADR-045 — 수식 열을 더하면 행마다 값이 생기지만 행의 수정 시각은 그대로다).
+   * 고쳐 쓰면 사본도 새 값이 되어 다음 pull 은 건너뛴다.
    *
    * 지난 동기화 뒤 로컬을 고친 행은 고르지 않는다 — 로컬 편집을 지키느라 쓰지 않으니 pull 마다 고르기만
    * 한다. 그 편집을 올린 뒤의 pull 이 고른다. 로컬 파일을 읽지 못하면 고르지 않는다.
    */
-  async outdatedDateForm(record, page) {
+  async staleKeysToRewrite(record, page, refreshed) {
     const base = snapshotFrontmatter(record.baseSnapshot);
-    if (base === null || this.propertyMapper.outdatedDateKeys(base, rowProperties(page)).length === 0) {
+    if (base === null || this.staleKeys(base, rowProperties(page), refreshed).length === 0) {
       return false;
     }
     try {
@@ -16252,25 +16986,37 @@ var DatabaseSyncer = class {
       return false;
     }
   }
+  /** 적힌 frontmatter 에서 받은 값으로 고쳐 쓸 키 — {@link staleKeysToRewrite}. */
+  staleKeys(written, raw, refreshed) {
+    const keys = new Set(this.propertyMapper.outdatedDateKeys(written, raw));
+    if (refreshed && refreshed.size > 0) {
+      const fresh = this.propertyMapper.fromNotionProperties(raw);
+      for (const key of refreshed) {
+        if (raw[key]?.type === "files") continue;
+        if (!sameFrontmatterValue(written[key] ?? null, fresh[key] ?? null)) keys.add(key);
+      }
+    }
+    return [...keys];
+  }
   /**
-   * 예전 버전이 적은 날짜 모양이 남은 행에서 그 키들만 새 모양으로 고쳐 쓴다(F-08) — 원격이 그대로라 본문 ·
-   * 첨부는 다시 받지 않는다. 본문은 한 글자도 바꾸지 않고, 다른 키의 줄은 그대로 둔다(키 단위로 나눠 읽을
-   * 수 없는 frontmatter 는 값만 지킨다 — {@link mergeRowFrontmatter}).
+   * 원격이 그대로인 행에서 {@link staleKeys} 의 키만 받은 값으로 고쳐 쓴다 — 본문 · 첨부는 다시 받지 않는다. 본문은
+   * 한 글자도 바꾸지 않고, 다른 키의 줄은 그대로 둔다(키 단위로 나눠 읽을 수 없는 frontmatter 는 값만 지킨다 —
+   * {@link mergeRowFrontmatter}).
    *
    * 예전에는 행을 통째로 다시 받았다. 행마다 본문을 읽어 요청이 늘고, 다시 그릴 때마다 달라지는 본문(빈
    * 블록 · 첨부 이름)까지 바뀌었다 — 실볼트 사본에서 다시 받은 149행 중 99행.
    *
    * 고른 뒤 로컬을 고쳤으면 쓰지 않는다(`skipped`) — 이어지는 push 가 올린다.
    */
-  async rewriteDateForms(page, record) {
+  async rewriteStaleKeys(page, record, refreshed) {
     const path = record.obsidianPath;
     const local = await this.vaultFs.readFile(path);
     if (computeHash(local) !== record.contentHash) return { action: "skipped", path };
     const raw = rowProperties(page);
-    const keys = this.propertyMapper.outdatedDateKeys(splitFrontmatter(local).data, raw);
+    const keys = this.staleKeys(splitFrontmatter(local).data, raw, refreshed);
     const fresh = this.propertyMapper.fromNotionProperties(raw);
     const pulled = Object.fromEntries(
-      keys.filter((key) => Object.hasOwn(fresh, key)).map((key) => [key, fresh[key]])
+      keys.filter((key) => Object.hasOwn(fresh, key) && !isEmptyFrontmatterValue(fresh[key])).map((key) => [key, fresh[key]])
     );
     const lines = keys.length > 0 ? mergeRowFrontmatter(local, pulled, new Set(keys)) : null;
     const content = lines === null ? null : replaceFrontmatterLines(local, lines);
@@ -16283,6 +17029,86 @@ var DatabaseSyncer = class {
     });
     return { action: "written", path };
   }
+  /**
+   * Notion 에서 바뀐 속성을 지난 pull 이 본 스키마와 id 로 견줘 행 노트에 옮긴다(ADR-045) — 이름을 바꾼 속성은 키
+   * 이름을, 지운 속성은 키를. 새로 생기거나 타입이 바뀐 속성은 돌려준다 — 그대로인 행도 그 값을 고쳐 쓴다.
+   *
+   * 처음 보는 DB 는 견줄 것이 없어 적기만 한다. 행 하나라도 옮기지 못하면 본 스키마를 적지 않는다 — 다음 pull 이 다시
+   * 옮긴다(이미 옮긴 행은 바꿀 것이 없다).
+   *
+   * @returns 바뀐 속성(data source → 바뀐 것, 바뀐 소스만)과 키를 바꾼 행의 레코드 id.
+   */
+  async followSchema(dbConfig, meta, pages) {
+    const changes = /* @__PURE__ */ new Map();
+    const seen = seenSchemaOf(meta);
+    if (seen === null) return { changes, rekeyed: /* @__PURE__ */ new Set() };
+    const before = this.schemaLedger.get(dbConfig.databaseId);
+    for (const [source, after] of Object.entries(seen)) {
+      const prev = before?.[source];
+      if (!prev) continue;
+      const change = diffSourceSchema(prev, after);
+      if (!isEmptySchemaChange(change)) changes.set(source, change);
+    }
+    let rekeyed2 = /* @__PURE__ */ new Set();
+    if (changes.size > 0) {
+      const sources = Object.keys(seen);
+      const soleSource = meta.dataSources.length <= 1 && sources.length === 1 ? sources[0] : null;
+      const outcome = await rekeyTrackedRows(
+        this.stateDb,
+        this.vaultFs,
+        dbConfig.databaseId,
+        pages,
+        changes,
+        soleSource
+      );
+      rekeyed2 = new Set(outcome.rewritten);
+      this.noteSchemaFollowed(dbConfig, changes, outcome);
+      if (outcome.failed > 0) {
+        getLogger().warn(
+          `[DB Sync] ${dbConfig.localFolder}: \uBC14\uB010 \uC18D\uC131\uC744 \uD589 \uB178\uD2B8 ${outcome.failed}\uAC1C\uC5D0 \uC62E\uAE30\uC9C0 \uBABB\uD568 \u2014 \uB2E4\uC74C pull \uC774 \uB2E4\uC2DC \uD569\uB2C8\uB2E4`
+        );
+        return { changes, rekeyed: rekeyed2 };
+      }
+    }
+    this.schemaLedger.set(dbConfig.databaseId, seen);
+    return { changes, rekeyed: rekeyed2 };
+  }
+  /** 옮긴 것을 pull 마감이 알리게 적는다 — 이름 바꿈 · 지움이 있었던 DB 만. 날짜 범위 끝 키는 따로 세지 않는다. */
+  noteSchemaFollowed(dbConfig, changes, outcome) {
+    const derived = (key, keys) => key.endsWith(RANGE_END_SUFFIX) && keys.has(key.slice(0, -RANGE_END_SUFFIX.length));
+    const renamed = [...changes.values()].flatMap(
+      (c) => [...c.renamed].filter(([from]) => !derived(from, c.renamed))
+    );
+    const removed = [...changes.values()].flatMap(
+      (c) => [...c.removed].filter((key) => !derived(key, c.removed))
+    );
+    if (renamed.length === 0 && removed.length === 0) return;
+    this.schemaFollowed.push({
+      folder: dbConfig.localFolder,
+      renamed,
+      removed,
+      rows: outcome.rewritten.length,
+      kept: outcome.kept
+    });
+  }
+  /** 이번 pull 이 행 노트에 옮긴 Notion 속성 변경 — 가져가면 비운다(ADR-045). */
+  /** 고쳐 둔 것이라 덮어쓰지 않은 사이드카 — 가져가면 비운다. */
+  takeHeldSidecars() {
+    const held = [...this.heldSidecars];
+    this.heldSidecars = /* @__PURE__ */ new Set();
+    return held;
+  }
+  /** 고쳐 둔 것이라 덮어쓰지 않은 `.base` — 가져가면 비운다. */
+  takeHeldBases() {
+    const held = [...this.heldBases];
+    this.heldBases = /* @__PURE__ */ new Set();
+    return held;
+  }
+  takeSchemaFollowed() {
+    const followed = this.schemaFollowed;
+    this.schemaFollowed = [];
+    return followed;
+  }
   /** 이 DB 의 추적 행 가운데 이번 조회에 없던 것 — 지워졌는지는 아직 모른다. */
   unlistedRows(dbConfig, pages, paths) {
     const listed = new Set(pages.map((page) => normalizeNotionId(page.id)));
@@ -16394,7 +17220,7 @@ var DatabaseSyncer = class {
         lastSynced: (/* @__PURE__ */ new Date()).toISOString(),
         views: [{ id: "default", name: "Table", type: "table" }]
       };
-      const baseContent = this.baseFileGenerator.generate({
+      const generated = this.baseFileGenerator.generateWithViews({
         databaseId: dbConfig.databaseId,
         databaseName: dbName,
         schema: schemaFull,
@@ -16402,12 +17228,21 @@ var DatabaseSyncer = class {
         folderPath: rowsFolder ?? dbConfig.localFolder,
         rangeEnds
       });
+      const baseContent = generated.content;
       const safeName = sanitizeFileName(dbName);
       const basePath = `${dbConfig.localFolder}/${safeName}${BASE_SUFFIX}`;
       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)) {
+      let record = {
+        basePath,
+        title: dbName,
+        hash: computeHash(baseContent),
+        // Notion 보기를 받지 못해 기본 표 하나를 쓴 파일은 올릴 보기가 없다.
+        ...viewsConfig ? recordBaseViews(baseContent, generated.views, viewsConfig.views) : null
+      };
+      const ours = existing === null || isGeneratedDbArtifact(basePath, existing) || previous?.basePath === basePath && previous.views !== void 0;
+      if (!ours) {
+        record = { basePath, title: dbName, hash: record.hash };
         if (!this.keptUserBases.has(basePath)) {
           this.keptUserBases.add(basePath);
           getLogger().info(
@@ -16415,12 +17250,12 @@ var DatabaseSyncer = class {
           );
         }
       } else if (existing !== null && existing !== baseContent && editedSince(previous, basePath, existing)) {
-        hash = previous.hash;
+        record = { ...previous, title: dbName };
         this.warnEditedBase(basePath);
       } else if (existing !== baseContent) {
         await this.vaultFs.writeFile(basePath, baseContent);
       }
-      this.baseFileInfo.set(dbConfig.databaseId, { basePath, title: dbName, hash });
+      this.baseFileInfo.set(dbConfig.databaseId, record);
       getLogger().debug(`[DB Sync] .base \uD30C\uC77C \uC0DD\uC131: ${basePath}`);
       await this.generateSidecar(
         dbConfig,
@@ -16465,10 +17300,11 @@ var DatabaseSyncer = class {
   }
   /** 볼트에서 고친 `.base` 를 덮어쓰거나 지우지 않았다고 한 번 알린다. */
   warnEditedBase(path) {
+    this.heldBases.add(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 Sync] \uBCFC\uD2B8\uC5D0\uC11C \uACE0\uCE5C .base \uB77C Notion \uBCF4\uAE30\uB85C \uB36E\uC5B4\uC4F0\uC9C0 \uC54A\uC74C: ${path} \u2014 push \uD558\uBA74 \uACE0\uCE5C \uBCF4\uAE30 \uC774\uB984 \xB7 \uC5F4 \xB7 \uC815\uB82C \xB7 \uD544\uD130\uB97C Notion \uC5D0 \uC62C\uB9BD\uB2C8\uB2E4. Notion \uC758 \uBCF4\uAE30\uB97C \uB2E4\uC2DC \uBC1B\uC73C\uB824\uBA74 \uC774 \uD30C\uC77C\uC744 \uC9C0\uC6B0\uC138\uC694`
     );
   }
   /**
@@ -16487,6 +17323,7 @@ var DatabaseSyncer = class {
       for (const path of stale) {
         const content = await this.vaultFs.readFile(path).catch(() => null);
         if (content === null || !isGeneratedDbArtifact(path, content)) continue;
+        if (this.heldSidecars.has(path)) continue;
         if (editedSince(previous, path, content)) {
           this.warnEditedBase(path);
           continue;
@@ -16513,11 +17350,26 @@ var DatabaseSyncer = class {
         isInline,
         appearance
       });
-      const sidecarPath = `${dbConfig.localFolder}/${safeName}${SIDECAR_SUFFIX}`;
-      const serialized = this.sidecarGenerator.serialize(sidecar);
-      const existing = await this.vaultFs.readFile(sidecarPath).catch(() => null);
+      const sidecarPath = `${dbConfig.localFolder}/${safeName}${SIDECAR_SUFFIX}`;
+      const serialized = this.sidecarGenerator.serialize(sidecar);
+      const existing = await this.vaultFs.readFile(sidecarPath).catch(() => null);
+      if (existing !== null && existing !== serialized && !isGeneratedDbArtifact(sidecarPath, existing)) {
+        return;
+      }
+      const previous = this.sidecarBases.get(dbConfig.databaseId);
+      if (previous) {
+        const written = previous.path === sidecarPath ? existing : await this.vaultFs.readFile(previous.path).catch(() => null);
+        if (written !== null && written !== serialized && computeHash(written) !== previous.hash && isGeneratedDbArtifact(previous.path, written) && sidecarPropertiesEdited(written, previous)) {
+          this.heldSidecars.add(previous.path);
+          return;
+        }
+      }
+      this.sidecarBases.set(dbConfig.databaseId, {
+        path: sidecarPath,
+        hash: computeHash(serialized),
+        properties: sidecar.properties
+      });
       if (existing === serialized) return;
-      if (existing !== null && !isGeneratedDbArtifact(sidecarPath, existing)) return;
       await this.vaultFs.writeFile(sidecarPath, serialized);
       if (sidecar.degraded.length > 0) {
         const unrep = sidecar.degraded.filter((d) => d.kind === "view-unrepresentable").length;
@@ -17000,19 +17852,19 @@ function threeWayMerge(base, local, remote) {
     }
     const regionStart = first.baseStart;
     let regionEnd = first.baseEnd;
-    const group = [first];
+    const group2 = [first];
     i++;
     while (i < hunks.length) {
       const next = hunks[i];
       const overlaps = next.baseStart < regionEnd || regionEnd === regionStart && next.baseStart === regionStart;
       if (!overlaps) break;
       regionEnd = Math.max(regionEnd, next.baseEnd);
-      group.push(next);
+      group2.push(next);
       i++;
     }
     const baseRegion = baseLines.slice(regionStart, regionEnd);
-    const localRegion = applyHunks(baseLines, group, 0, regionStart, regionEnd);
-    const remoteRegion = applyHunks(baseLines, group, 2, regionStart, regionEnd);
+    const localRegion = applyHunks(baseLines, group2, 0, regionStart, regionEnd);
+    const remoteRegion = applyHunks(baseLines, group2, 2, regionStart, regionEnd);
     if (arraysEqual(localRegion, baseRegion)) {
       merged.push(...remoteRegion);
     } else if (arraysEqual(remoteRegion, baseRegion)) {
@@ -17063,10 +17915,10 @@ function computeHunks(base, modified, side) {
   emitGap(base.length, modified.length);
   return hunks;
 }
-function applyHunks(baseLines, group, side, regionStart, regionEnd) {
+function applyHunks(baseLines, group2, side, regionStart, regionEnd) {
   const out = [];
   let b = regionStart;
-  for (const hunk of group) {
+  for (const hunk of group2) {
     if (hunk.side !== side) continue;
     if (hunk.baseStart > b) out.push(...baseLines.slice(b, hunk.baseStart));
     out.push(...hunk.content);
@@ -17421,165 +18273,1071 @@ var ScopedVaultFS = class {
       const local = this.fromBase(item.path);
       if (local !== null) out.push({ ...item, path: local });
     }
-    return out;
+    return out;
+  }
+};
+
+// src/sync/pull-watermark.ts
+var INCREMENTAL_SAFETY_WINDOW_MS = 15 * 6e4;
+function incrementalSearchSince(watermark) {
+  const ms = Date.parse(watermark);
+  return Number.isFinite(ms) ? new Date(ms - INCREMENTAL_SAFETY_WINDOW_MS).toISOString() : watermark;
+}
+function nextPullWatermark(startedAt, unapplied) {
+  let earliest = Date.parse(startedAt);
+  for (const change of unapplied) {
+    if (change.type === "deleted") continue;
+    const edited = Date.parse(change.lastEdited);
+    if (Number.isFinite(edited) && edited < earliest) earliest = edited;
+  }
+  return new Date(earliest).toISOString();
+}
+
+// src/sync/remote-scan.ts
+var LAST_FULL_PULL_META_KEY = "last_full_pull_at";
+var LAST_PULL_META_KEY = "last_pull_at";
+var PENDING_DATABASES_META_KEY = "db_pull_pending";
+function chooseRemoteScan(state, options) {
+  if (options.force) return { kind: "full", reason: "forced" };
+  if (state.databaseMode) return { kind: "full", reason: "database-mode" };
+  if (!state.lastPullAt || state.trackedRecords === 0) return { kind: "full", reason: "first" };
+  if (!Number.isFinite(state.fullReconcileIntervalSec) || state.fullReconcileIntervalSec <= 0) {
+    return { kind: "full", reason: "every-pull" };
+  }
+  const nextFullAt = nextFullReconcileAt(state.lastFullPullAt, state.fullReconcileIntervalSec);
+  if (nextFullAt === null || Date.parse(nextFullAt) <= options.now) {
+    if (!options.deferDue) return { kind: "full", reason: "due" };
+    return {
+      kind: "incremental",
+      since: state.lastPullAt,
+      lastFullAt: state.lastFullPullAt,
+      nextFullAt: null
+    };
+  }
+  return {
+    kind: "incremental",
+    since: state.lastPullAt,
+    lastFullAt: state.lastFullPullAt,
+    nextFullAt
+  };
+}
+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, deletionsChecked = false) {
+  return scan.kind === "full" ? {
+    kind: "full",
+    reason: scan.reason,
+    lastFullAt: lastFullPullAt,
+    nextFullAt: null,
+    deletionsDeferred: false
+  } : {
+    kind: "incremental",
+    lastFullAt: scan.lastFullAt,
+    nextFullAt: scan.nextFullAt,
+    deletionsDeferred: deleteSync && !deletionsChecked
+  };
+}
+var ALL_DATABASES = { kind: "all" };
+function selectsDatabase(selection, databaseId) {
+  return selection.kind === "all" || selection.ids.has(compactNotionId(databaseId));
+}
+function parsePendingDatabases(raw) {
+  if (!raw) return /* @__PURE__ */ new Set();
+  try {
+    const parsed = JSON.parse(raw);
+    if (!Array.isArray(parsed)) return /* @__PURE__ */ new Set();
+    return new Set(
+      parsed.filter((id) => typeof id === "string").map((id) => compactNotionId(id))
+    );
+  } catch {
+    return /* @__PURE__ */ new Set();
+  }
+}
+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;
+    this.pending = pending;
+  }
+  selection;
+  pending;
+  settled = /* @__PURE__ */ new Set();
+  unfinished = /* @__PURE__ */ new Set();
+  skippedCount = 0;
+  /** 이제 동기화하는 DB — 알면 대기를 이것으로 좁힌다. */
+  syncing = null;
+  /** 이 DB 를 조회하나 — 새로 발견한 DB 는 부른 쪽이 따로 조회한다(받은 적이 없다). */
+  selects(databaseId) {
+    return selectsDatabase(this.selection, databaseId);
+  }
+  /** 바뀐 것이 보이지 않아 조회하지 않았다. */
+  skip() {
+    this.skippedCount++;
+  }
+  /** 받았거나 · 이제 없어서 뺐다 — 다시 조회할 것이 없다. */
+  settle(databaseId) {
+    this.settled.add(compactNotionId(databaseId));
+  }
+  /** 조회하다 실패했거나 · 받지 못한 행이 있거나 · 취소로 닿지 못했다 — 다음 pull 이 다시 조회한다. */
+  retry(databaseId) {
+    this.unfinished.add(compactNotionId(databaseId));
+  }
+  get skipped() {
+    return this.skippedCount;
+  }
+  /**
+   * 이제 동기화하는 DB 를 알린다 — 대기를 이것으로 좁힌다. 설정에서 뺐거나 접근 불가로 뺀 DB 를 영영
+   * 들고 있지 않는다. 알리지 않으면(발견이 멈춤 등) 좁히지 않는다 — 모르는 것을 버리지 않는다.
+   */
+  keepOnly(databaseIds) {
+    this.syncing = new Set([...databaseIds].map((id) => compactNotionId(id)));
+  }
+  /** 다음 pull 의 대기 — 지난 대기에서 받은 것을 빼고 이번에 받지 못한 것을 더한다. */
+  nextPending() {
+    const next = new Set([...this.pending].filter((id) => !this.settled.has(id)));
+    for (const id of this.unfinished) next.add(id);
+    const syncing = this.syncing;
+    return syncing ? new Set([...next].filter((id) => syncing.has(id))) : next;
+  }
+};
+
+// src/sync/schema-push.ts
+var NOT_PROPERTIES = /* @__PURE__ */ new Set(["title", ...DECORATION_KEYS]);
+var VaultSchemaRenames = class {
+  constructor(stateDb, vaultFs, notionClient) {
+    this.stateDb = stateDb;
+    this.vaultFs = vaultFs;
+    this.notionClient = notionClient;
+    this.ledger = new SchemaLedger(stateDb);
+  }
+  stateDb;
+  vaultFs;
+  notionClient;
+  ledger;
+  /** 이번 push 의 바뀐 행에서 이름 바꾸기를 찾는다 — Notion 은 그런 DB 만 읽고, 쓰지 않는다. */
+  async plan(changes) {
+    const byDatabase = /* @__PURE__ */ new Map();
+    for (const change of changes) {
+      if (change.type !== "modified") continue;
+      const row = await this.changedRow(change.path);
+      if (!row) continue;
+      const key = compactNotionId(row.record.notionParentId);
+      byDatabase.set(key, [...byDatabase.get(key) ?? [], row]);
+    }
+    const planned = [];
+    const refused = [];
+    for (const rows of byDatabase.values()) {
+      const databaseId = rows[0].record.notionParentId;
+      const pairs = await this.localRenames(databaseId, rows);
+      if (pairs.length === 0) continue;
+      const meta = await this.notionClient.getDatabaseMeta(databaseId);
+      for (const [from, to] of pairs) {
+        const carrying = rows.filter((row) => Object.hasOwn(row.current, to));
+        const folder = folderOf4(carrying[0].record.obsidianPath);
+        const owners = meta.dataSources.filter(
+          (ds) => ds.properties?.[from] !== void 0
+        );
+        if (owners.length === 0) continue;
+        const owner = owners[0];
+        const ownProps = owner.properties;
+        if (Object.hasOwn(ownProps, to)) continue;
+        const propertyId = ownProps[from]?.id;
+        if (owners.length > 1 || typeof propertyId !== "string") {
+          const error = `\uC18D\uC131 \uC774\uB984 \u300C${from}\u300D \u2192 \u300C${to}\u300D \uB97C Notion \uC5D0 \uC62E\uAE38 \uC218 \uC5C6\uC5B4 \uC62C\uB9AC\uC9C0 \uC54A\uC558\uC2B5\uB2C8\uB2E4 \u2014 \uC774 DB \uC758 \uB370\uC774\uD130 \uC18C\uC2A4 \uC5EC\uB7FF\uC5D0 \u300C${from}\u300D \uC774 \uC788\uC2B5\uB2C8\uB2E4. Notion \uC5D0\uC11C \uBC14\uAFB8\uC138\uC694`;
+          refused.push(
+            ...carrying.map((row) => ({
+              path: row.record.obsidianPath,
+              operation: "update",
+              error
+            }))
+          );
+          continue;
+        }
+        planned.push({
+          databaseId,
+          dataSourceId: owner.id,
+          propertyId,
+          folder,
+          from,
+          to,
+          rows: carrying.map((row) => row.record)
+        });
+      }
+    }
+    return { planned, refused };
+  }
+  /**
+   * 열 이름을 바꾸고, 그 행들의 동기화 사본도 새 키로 — 사본이 옛 키를 들고 있으면 행 push 가 옛 열을 비운다. 이름
+   * 바꾸기 말고 바뀐 것이 없는 행은 동기화를 마친 것으로 적는다.
+   */
+  async apply(planned) {
+    const applied = [];
+    const settled = /* @__PURE__ */ new Set();
+    const failed = [];
+    for (const rename2 of planned) {
+      try {
+        const after = await this.notionClient.updateDataSourceProperties(rename2.dataSourceId, {
+          [rename2.propertyId]: { name: rename2.to }
+        });
+        if (after[rename2.to]?.id !== rename2.propertyId) {
+          getLogger().warn(
+            `[Im-Nobsidian] \uC18D\uC131 \uC774\uB984 \u300C${rename2.from}\u300D \u2192 \u300C${rename2.to}\u300D: Notion \uC774 \uB2E4\uB978 \uC774\uB984\uC744 \uBD99\uC600\uC2B5\uB2C8\uB2E4 \u2014 Notion \uC5D0\uC11C \uD655\uC778\uD558\uC138\uC694`
+          );
+        }
+      } catch (error) {
+        const reason = error instanceof Error ? error.message : String(error);
+        for (const record of rename2.rows) {
+          failed.push({
+            path: record.obsidianPath,
+            operation: "update",
+            error: `\uC18D\uC131 \uC774\uB984 \u300C${rename2.from}\u300D \u2192 \u300C${rename2.to}\u300D \uB97C Notion \uC5D0\uC11C \uBC14\uAFB8\uC9C0 \uBABB\uD574 \uC62C\uB9AC\uC9C0 \uC54A\uC558\uC2B5\uB2C8\uB2E4: ${reason}`
+          });
+        }
+        continue;
+      }
+      applied.push({ folder: rename2.folder, from: rename2.from, to: rename2.to });
+      this.noteRenamed(rename2);
+      for (const record of rename2.rows) {
+        if (await this.rekeySnapshot(record, rename2)) settled.add(record.obsidianPath);
+      }
+    }
+    return { applied, settled, failed };
+  }
+  /** 바뀐 행 노트 — 지난 동기화 사본이 있는 DB 행만. */
+  async changedRow(path) {
+    const record = this.stateDb.getByPath(path);
+    if (record?.fileType !== "db-row" || !record.notionParentId) return null;
+    const base = snapshotFrontmatter(record.baseSnapshot);
+    if (base === null) return null;
+    try {
+      const current = splitFrontmatter(await this.vaultFs.readFile(path)).data;
+      return { record, base, current };
+    } catch {
+      return null;
+    }
+  }
+  /** 바뀐 행이 말하는 이름 바꾸기 — 옛 키 → 새 키. 한 키를 두 갈래로 읽을 수 있으면 뺀다. */
+  async localRenames(databaseId, rows) {
+    const candidates = /* @__PURE__ */ new Map();
+    for (const { base, current } of rows) {
+      for (const from of Object.keys(base)) {
+        if (NOT_PROPERTIES.has(from) || Object.hasOwn(current, from)) continue;
+        const value = plainFrontmatterValue(base[from]);
+        if (isEmptyFrontmatterValue(value)) continue;
+        for (const to of Object.keys(current)) {
+          if (NOT_PROPERTIES.has(to) || Object.hasOwn(base, to)) continue;
+          if (!sameFrontmatterValue(value, plainFrontmatterValue(current[to]))) continue;
+          candidates.set(from, /* @__PURE__ */ new Set([...candidates.get(from) ?? [], to]));
+        }
+      }
+    }
+    const pairs = [];
+    const targets = /* @__PURE__ */ new Map();
+    for (const [from, tos] of candidates) {
+      const consistent = [...tos].filter(
+        (to) => rows.every(
+          ({ base, current }) => !Object.hasOwn(current, from) && (isEmptyFrontmatterValue(plainFrontmatterValue(base[from])) || Object.hasOwn(current, to))
+        )
+      );
+      if (consistent.length !== 1) continue;
+      pairs.push([from, consistent[0]]);
+      targets.set(consistent[0], (targets.get(consistent[0]) ?? 0) + 1);
+    }
+    const unique = pairs.filter(([, to]) => targets.get(to) === 1);
+    if (unique.length === 0) return [];
+    const changed = new Set(rows.map((row) => row.record.id));
+    const others = this.stateDb.getAll().filter(
+      (record) => record.fileType === "db-row" && record.notionParentId !== null && notionIdsEqual(record.notionParentId, databaseId) && !changed.has(record.id)
+    );
+    const keysOf = await Promise.all(others.map((record) => this.keysOf(record)));
+    return unique.filter(
+      ([from, to]) => keysOf.every((keys) => keys !== null && !keys.has(from) && !keys.has(to))
+    );
+  }
+  /** 행 노트에 지금 적힌 키 — 읽지 못하면 null(그 DB 의 이름 바꾸기는 보지 않는다). */
+  async keysOf(record) {
+    try {
+      const data = splitFrontmatter(await this.vaultFs.readFile(record.obsidianPath)).data;
+      return new Set(Object.keys(data).filter((key) => !isEmptyFrontmatterValue(data[key])));
+    } catch {
+      return null;
+    }
+  }
+  /** 그 행의 사본을 새 키로 — 노트가 사본과 같아졌으면 true(동기화를 마쳤다). */
+  async rekeySnapshot(record, rename2) {
+    const snapshot = record.baseSnapshot?.toString("utf-8");
+    if (snapshot === void 0) return false;
+    const lines = rekeyRowFrontmatter(snapshot, /* @__PURE__ */ new Map([[rename2.from, rename2.to]]), () => false);
+    const next = lines === null ? null : replaceFrontmatterLines(snapshot, lines);
+    if (next === null) return false;
+    let local = null;
+    try {
+      local = await this.vaultFs.readFile(record.obsidianPath);
+    } catch {
+    }
+    const synced = local !== null && sameRow(local, next);
+    const content = synced ? local : next;
+    this.stateDb.transaction(() => {
+      this.stateDb.updateHash(record.id, computeHash(content), Buffer.from(content, "utf-8"));
+    });
+    return synced;
+  }
+  /** 지난 pull 이 본 스키마에도 새 이름을 적는다 — 다음 pull 이 이 이름 바꾸기를 Notion 의 것으로 다시 옮기지 않게. */
+  noteRenamed(rename2) {
+    const seen = this.ledger.get(rename2.databaseId);
+    const source = compactNotionId(rename2.dataSourceId);
+    const known = seen?.[source]?.[rename2.propertyId];
+    if (!seen || !known) return;
+    this.ledger.set(rename2.databaseId, {
+      [source]: { ...seen[source], [rename2.propertyId]: { ...known, name: rename2.to } }
+    });
+  }
+};
+function sameRow(a, b) {
+  const left = splitFrontmatter(a);
+  const right = splitFrontmatter(b);
+  const keys = Object.keys(left.data);
+  return left.content === right.content && keys.length === Object.keys(right.data).length && keys.every((key) => sameFrontmatterValue(left.data[key], right.data[key]));
+}
+function folderOf4(path) {
+  const at = path.lastIndexOf("/");
+  return at === -1 ? "" : path.slice(0, at);
+}
+
+// src/view/bases-filter-to-notion.ts
+var MAX_FILTER_DEPTH = 2;
+var TEXT_TYPES = /* @__PURE__ */ new Set([
+  "title",
+  "rich_text",
+  "url",
+  "email",
+  "phone_number"
+]);
+var EMPTY_TYPES = /* @__PURE__ */ new Set([
+  ...TEXT_TYPES,
+  "number",
+  "select",
+  "status",
+  "multi_select",
+  "date"
+]);
+var NUMBER_OPS = {
+  "==": "equals",
+  "!=": "does_not_equal",
+  ">": "greater_than",
+  "<": "less_than",
+  ">=": "greater_than_or_equal_to",
+  "<=": "less_than_or_equal_to"
+};
+var DATE_OPS = {
+  "==": "equals",
+  "<": "before",
+  ">": "after",
+  "<=": "on_or_before",
+  ">=": "on_or_after"
+};
+var RELATIVE_VALUE_OF = new Map(
+  Object.entries(RELATIVE_DATE_VALUES).map(([value, expr]) => [squash(expr), value])
+);
+var Refusal = class extends Error {
+};
+function refuse(message) {
+  throw new Refusal(message);
+}
+function basesFilterToNotion(node, schema) {
+  try {
+    const filter = settle([toFilter(node, schema)])[0];
+    if (depthOf(filter) > MAX_FILTER_DEPTH) {
+      refuse("Notion \uD544\uD130\uB294 and \xB7 or \uBB36\uC74C\uC744 \uB450 \uACB9\uAE4C\uC9C0\uB9CC \uBC1B\uC2B5\uB2C8\uB2E4");
+    }
+    return { ok: true, filter };
+  } catch (error) {
+    if (error instanceof Refusal) return { ok: false, error: error.message };
+    throw error;
+  }
+}
+function toFilter(node, schema) {
+  if (typeof node === "string") return compile(parseExpression(node), schema);
+  if (!node || typeof node !== "object" || Array.isArray(node)) {
+    refuse("\uD544\uD130\uB294 \uC2DD \uD558\uB098\uC774\uAC70\uB098 and \xB7 or \xB7 not \uBB36\uC74C\uC774\uC5B4\uC57C \uD569\uB2C8\uB2E4");
+  }
+  const group2 = node;
+  const keys = Object.keys(group2);
+  if (keys.length !== 1 || !["and", "or", "not"].includes(keys[0])) {
+    refuse(`\uD544\uD130 \uBB36\uC74C\uC740 and \xB7 or \xB7 not \uC911 \uD558\uB098\uC5EC\uC57C \uD569\uB2C8\uB2E4(${keys.join(", ")})`);
+  }
+  const op = keys[0];
+  const children = group2[op];
+  if (!Array.isArray(children) || children.length === 0) refuse(`${op} \uBB36\uC74C\uC774 \uBE44\uC5B4 \uC788\uC2B5\uB2C8\uB2E4`);
+  const asts = children.map(
+    (child) => typeof child === "string" ? parseExpression(child) : { kind: "yaml", node: child }
+  );
+  const ast = op === "not" ? { kind: "and", items: asts.map((item) => ({ kind: "not", item })) } : { kind: op, items: asts };
+  return compile(ast, schema);
+}
+var OPERATORS = [
+  "&&",
+  "||",
+  "==",
+  "!=",
+  ">=",
+  "<=",
+  ">",
+  "<",
+  "!",
+  "+",
+  "-",
+  "(",
+  ")",
+  "[",
+  "]",
+  ".",
+  ","
+];
+function tokenize(text) {
+  const tokens = [];
+  let i = 0;
+  while (i < text.length) {
+    const c = text[i];
+    if (/\s/.test(c)) {
+      i++;
+      continue;
+    }
+    if (c === '"' || c === "'") {
+      let value = "";
+      i++;
+      while (i < text.length && text[i] !== c) {
+        if (text[i] === "\\" && i + 1 < text.length) i++;
+        value += text[i];
+        i++;
+      }
+      if (i >= text.length) refuse(`\uB530\uC634\uD45C\uAC00 \uB2EB\uD788\uC9C0 \uC54A\uC558\uC2B5\uB2C8\uB2E4: ${text}`);
+      i++;
+      tokens.push({ t: "string", v: value });
+      continue;
+    }
+    const number = /^\d+(?:\.\d+)?/.exec(text.slice(i));
+    if (number) {
+      tokens.push({ t: "number", v: Number(number[0]) });
+      i += number[0].length;
+      continue;
+    }
+    const op = OPERATORS.find((o) => text.startsWith(o, i));
+    if (op) {
+      tokens.push({ t: "op", v: op });
+      i += op.length;
+      continue;
+    }
+    const ident = /^[\p{L}\p{N}_]+/u.exec(text.slice(i));
+    if (ident) {
+      tokens.push({ t: "ident", v: ident[0] });
+      i += ident[0].length;
+      continue;
+    }
+    refuse(`\uD544\uD130 \uC2DD\uC744 \uC77D\uC9C0 \uBABB\uD588\uC2B5\uB2C8\uB2E4: ${text}`);
   }
-};
-
-// src/sync/pull-watermark.ts
-var INCREMENTAL_SAFETY_WINDOW_MS = 15 * 6e4;
-function incrementalSearchSince(watermark) {
-  const ms = Date.parse(watermark);
-  return Number.isFinite(ms) ? new Date(ms - INCREMENTAL_SAFETY_WINDOW_MS).toISOString() : watermark;
+  return tokens;
 }
-function nextPullWatermark(startedAt, unapplied) {
-  let earliest = Date.parse(startedAt);
-  for (const change of unapplied) {
-    if (change.type === "deleted") continue;
-    const edited = Date.parse(change.lastEdited);
-    if (Number.isFinite(edited) && edited < earliest) earliest = edited;
-  }
-  return new Date(earliest).toISOString();
+function parseExpression(text) {
+  const tokens = tokenize(text);
+  let pos = 0;
+  const peek = (v) => {
+    const token2 = tokens[pos];
+    return v === void 0 || token2?.t === "op" && token2.v === v ? token2 : void 0;
+  };
+  const take = (v) => {
+    if (!peek(v)) return false;
+    pos++;
+    return true;
+  };
+  const expect = (v) => {
+    if (!take(v)) refuse(`\uD544\uD130 \uC2DD\uC5D0\uC11C '${v}' \uAC00 \uC640\uC57C \uD569\uB2C8\uB2E4: ${text}`);
+  };
+  const orExpr = () => {
+    const items = [andExpr()];
+    while (take("||")) items.push(andExpr());
+    return items.length === 1 ? items[0] : { kind: "or", items };
+  };
+  const andExpr = () => {
+    const items = [unary()];
+    while (take("&&")) items.push(unary());
+    return items.length === 1 ? items[0] : { kind: "and", items };
+  };
+  const unary = () => {
+    if (take("!")) return { kind: "not", item: unary() };
+    if (peek("(")) {
+      pos++;
+      const inner = orExpr();
+      expect(")");
+      return inner;
+    }
+    return comparison();
+  };
+  const comparison = () => {
+    const left = operand();
+    const op = tokens[pos];
+    if (op?.t === "op" && ["==", "!=", ">", "<", ">=", "<="].includes(op.v)) {
+      if (left.call) refuse(`\uD568\uC218 \uACB0\uACFC\uB97C \uACAC\uC8FC\uB294 \uC2DD\uC740 \uC62E\uAE30\uC9C0 \uC54A\uC2B5\uB2C8\uB2E4: ${text}`);
+      pos++;
+      return { kind: "compare", op: op.v, left: left.term, right: operand().term };
+    }
+    if (left.call) return left.call;
+    refuse(`\uBE44\uAD50\uB098 \uD568\uC218 \uD638\uCD9C\uC774 \uC544\uB2CC \uC2DD\uC740 \uC62E\uAE30\uC9C0 \uC54A\uC2B5\uB2C8\uB2E4: ${text}`);
+  };
+  const operand = () => {
+    const token2 = tokens[pos];
+    if (!token2) refuse(`\uD544\uD130 \uC2DD\uC774 \uB35C \uB05D\uB0AC\uC2B5\uB2C8\uB2E4: ${text}`);
+    if (token2.t === "string") {
+      pos++;
+      return { term: { kind: "string", value: token2.v } };
+    }
+    if (token2.t === "number") {
+      pos++;
+      return { term: { kind: "number", value: token2.v } };
+    }
+    if (token2.t === "ident" && (token2.v === "true" || token2.v === "false")) {
+      pos++;
+      return { term: { kind: "boolean", value: token2.v === "true" } };
+    }
+    if (token2.t === "ident" && (token2.v === "today" || token2.v === "date") && tokens[pos + 1]?.v === "(") {
+      return { term: dateTerm() };
+    }
+    if (token2.t === "ident") return reference();
+    refuse(`\uD544\uD130 \uC2DD\uC744 \uC77D\uC9C0 \uBABB\uD588\uC2B5\uB2C8\uB2E4: ${text}`);
+  };
+  const dateTerm = () => {
+    const start = pos;
+    const fn = tokens[pos].v;
+    pos += 2;
+    let literal;
+    if (fn === "date") {
+      const arg = tokens[pos];
+      if (arg?.t !== "string") refuse(`date() \uC5D0\uB294 \uB0A0\uC9DC \uBB38\uC790\uC5F4\uC744 \uB123\uC5B4\uC57C \uD569\uB2C8\uB2E4: ${text}`);
+      literal = arg.v;
+      pos++;
+    }
+    expect(")");
+    if (fn === "today" && (peek("+") || peek("-")) && tokens[pos + 1]?.t === "string") pos += 2;
+    const raw = tokens.slice(start, pos).map((t) => t.t === "string" ? JSON.stringify(t.v) : String(t.v)).join("");
+    return { kind: "date", text: raw, ...literal !== void 0 ? { literal } : {} };
+  };
+  const reference = () => {
+    const head = tokens[pos++].v;
+    let ref;
+    if ((head === "note" || head === "file") && (peek(".") || peek("["))) {
+      let name;
+      if (take("[")) {
+        const key = tokens[pos++];
+        if (key?.t !== "string") refuse(`${head}[\u2026] \uC5D0\uB294 \uBB38\uC790\uC5F4 \uC774\uB984\uC744 \uB123\uC5B4\uC57C \uD569\uB2C8\uB2E4: ${text}`);
+        name = key.v;
+        expect("]");
+      } else {
+        pos++;
+        const key = tokens[pos++];
+        if (key?.t !== "ident") refuse(`${head}. \uB4A4\uC5D0 \uC774\uB984\uC774 \uC640\uC57C \uD569\uB2C8\uB2E4: ${text}`);
+        name = key.v;
+      }
+      ref = { scope: head, name, dateOnly: false };
+    } else if (head === "formula" || head === "this") {
+      refuse(`${head} \uB294 Notion \uC18D\uC131\uC774 \uC544\uB2C8\uB77C \uC62E\uAE30\uC9C0 \uC54A\uC2B5\uB2C8\uB2E4: ${text}`);
+    } else {
+      ref = { scope: "note", name: head, dateOnly: false };
+    }
+    while (take(".")) {
+      const method = tokens[pos++];
+      if (method?.t !== "ident") refuse(`'.' \uB4A4\uC5D0 \uD568\uC218 \uC774\uB984\uC774 \uC640\uC57C \uD569\uB2C8\uB2E4: ${text}`);
+      expect("(");
+      const args = [];
+      if (!take(")")) {
+        do
+          args.push(operand().term);
+        while (take(","));
+        expect(")");
+      }
+      if (method.v === "date" && args.length === 0 && !ref.dateOnly) {
+        ref = { ...ref, dateOnly: true };
+        continue;
+      }
+      if (peek(".")) refuse(`\uD568\uC218\uB97C \uC774\uC5B4 \uBD80\uB978 \uC2DD\uC740 \uC62E\uAE30\uC9C0 \uC54A\uC2B5\uB2C8\uB2E4: ${text}`);
+      return {
+        term: { kind: "ref", ref },
+        call: { kind: "call", target: { kind: "ref", ref }, name: method.v, args }
+      };
+    }
+    return { term: { kind: "ref", ref } };
+  };
+  const ast = orExpr();
+  if (pos !== tokens.length) refuse(`\uD544\uD130 \uC2DD \uB05D\uC5D0 \uC77D\uC9C0 \uBABB\uD55C \uAC83\uC774 \uC788\uC2B5\uB2C8\uB2E4: ${text}`);
+  return ast;
+}
+function compile(ast, schema) {
+  switch (ast.kind) {
+    case "yaml":
+      return toFilter(ast.node, schema);
+    case "and":
+    case "or":
+      return group(
+        ast.kind,
+        ast.items.map((item) => compile(item, schema))
+      );
+    case "not":
+      return negate(compile(ast.item, schema));
+    case "compare":
+      return compare(ast, schema);
+    case "call":
+      return call(ast, schema);
+  }
+}
+function group(op, items) {
+  const merged = settle(op === "and" ? mergeRelativeRanges(items) : items);
+  return merged.length === 1 ? merged[0] : { [op]: merged };
+}
+function settle(items) {
+  return items.map((item) => {
+    if (!isPendingRange(item)) return item;
+    const { pending, ...leaf2 } = item;
+    if (Object.keys(leaf2).length === 0) {
+      refuse(`\uC0C1\uB300 \uAE30\uAC04 '${pending.text}' \uC740 \uBC18\uB300\uCABD \uB05D(today())\uACFC and \uB85C \uC9DD\uC744 \uC774\uB904\uC57C \uC62E\uAE41\uB2C8\uB2E4`);
+    }
+    return leaf2;
+  });
 }
-
-// src/sync/remote-scan.ts
-var LAST_FULL_PULL_META_KEY = "last_full_pull_at";
-var LAST_PULL_META_KEY = "last_pull_at";
-var PENDING_DATABASES_META_KEY = "db_pull_pending";
-function chooseRemoteScan(state, options) {
-  if (options.force) return { kind: "full", reason: "forced" };
-  if (state.databaseMode) return { kind: "full", reason: "database-mode" };
-  if (!state.lastPullAt || state.trackedRecords === 0) return { kind: "full", reason: "first" };
-  if (!Number.isFinite(state.fullReconcileIntervalSec) || state.fullReconcileIntervalSec <= 0) {
-    return { kind: "full", reason: "every-pull" };
+function compare(ast, schema) {
+  if (ast.left.kind !== "ref") refuse("\uBE44\uAD50\uC758 \uC67C\uCABD\uC740 \uC18D\uC131\uC774\uC5B4\uC57C \uD569\uB2C8\uB2E4");
+  const target = targetOf(ast.left.ref, schema);
+  const value = ast.right;
+  const leaf2 = (op, v) => ({
+    ...target.head,
+    [target.type]: { [op]: v }
+  });
+  if (TEXT_TYPES.has(target.type) || target.type === "select" || target.type === "status") {
+    if (value.kind !== "string") refuse(`${target.label}: \uBB38\uC790\uC5F4\uACFC\uB9CC \uACAC\uC904 \uC218 \uC788\uC2B5\uB2C8\uB2E4`);
+    if (ast.op === "==") return leaf2("equals", value.value);
+    if (ast.op === "!=") return leaf2("does_not_equal", value.value);
+    refuse(`${target.label}: '${ast.op}' \uB85C\uB294 \uACAC\uC8FC\uC9C0 \uBABB\uD569\uB2C8\uB2E4`);
+  }
+  if (target.type === "number") {
+    if (value.kind !== "number") refuse(`${target.label}: \uC22B\uC790\uC640\uB9CC \uACAC\uC904 \uC218 \uC788\uC2B5\uB2C8\uB2E4`);
+    return leaf2(NUMBER_OPS[ast.op], value.value);
+  }
+  if (target.type === "checkbox") {
+    if (value.kind !== "boolean") refuse(`${target.label}: true \xB7 false \uC640\uB9CC \uACAC\uC904 \uC218 \uC788\uC2B5\uB2C8\uB2E4`);
+    if (ast.op === "==") return leaf2("equals", value.value);
+    if (ast.op === "!=") return leaf2("does_not_equal", value.value);
+    refuse(`${target.label}: '${ast.op}' \uB85C\uB294 \uACAC\uC8FC\uC9C0 \uBABB\uD569\uB2C8\uB2E4`);
+  }
+  if (target.type === "date" || target.type === "created_time" || target.type === "last_edited_time") {
+    const op = DATE_OPS[ast.op];
+    if (!op) refuse(`${target.label}: \uB0A0\uC9DC\uB294 '${ast.op}' \uB85C \uACAC\uC8FC\uC9C0 \uBABB\uD569\uB2C8\uB2E4`);
+    return dateLeaf(target, op, ast.op, value);
+  }
+  refuse(`${target.label}: ${target.type} \uC18D\uC131\uC758 \uD544\uD130\uB294 \uC62E\uAE30\uC9C0 \uC54A\uC2B5\uB2C8\uB2E4`);
+}
+function dateLeaf(target, op, symbol, value) {
+  const leaf2 = (v) => ({ ...target.head, [target.type]: { [op]: v } });
+  if (value.kind === "string") {
+    if (!/^\d{4}-\d{2}-\d{2}/.test(value.value))
+      refuse(`${target.label}: \uB0A0\uC9DC\uAC00 \uC544\uB2CC \uAC12 '${value.value}'`);
+    return leaf2(value.value);
+  }
+  if (value.kind !== "date") refuse(`${target.label}: \uB0A0\uC9DC\uC640\uB9CC \uACAC\uC904 \uC218 \uC788\uC2B5\uB2C8\uB2E4`);
+  if (value.literal !== void 0) {
+    if (!/^\d{4}-\d{2}-\d{2}/.test(value.literal))
+      refuse(`${target.label}: \uB0A0\uC9DC\uAC00 \uC544\uB2CC \uAC12 '${value.literal}'`);
+    return leaf2(value.literal);
+  }
+  const pending = { target, symbol, text: value.text };
+  const relative2 = RELATIVE_VALUE_OF.get(value.text);
+  return relative2 === void 0 ? { pending } : { ...leaf2(relative2), pending };
+}
+function call(ast, schema) {
+  if (ast.target.kind !== "ref") refuse("\uD568\uC218\uB294 \uC18D\uC131\uC5D0 \uBD99\uC5EC\uC57C \uD569\uB2C8\uB2E4");
+  const target = targetOf(ast.target.ref, schema);
+  const leaf2 = (op, v) => ({
+    ...target.head,
+    [target.type]: { [op]: v }
+  });
+  const strings = ast.args.map((arg) => {
+    if (arg.kind !== "string") refuse(`${target.label}: ${ast.name}() \uC5D0\uB294 \uBB38\uC790\uC5F4\uC744 \uB123\uC5B4\uC57C \uD569\uB2C8\uB2E4`);
+    return arg.value;
+  });
+  if (ast.name === "isEmpty" && strings.length === 0) {
+    if (!EMPTY_TYPES.has(target.type)) refuse(`${target.label}: \uBE48 \uAC12 \uC870\uAC74\uC740 \uC62E\uAE30\uC9C0 \uC54A\uC2B5\uB2C8\uB2E4`);
+    return leaf2("is_empty", true);
+  }
+  if (TEXT_TYPES.has(target.type) && strings.length === 1) {
+    if (ast.name === "contains") return leaf2("contains", strings[0]);
+    if (ast.name === "startsWith") return leaf2("starts_with", strings[0]);
+    if (ast.name === "endsWith") return leaf2("ends_with", strings[0]);
+  }
+  if (target.type === "multi_select" && strings.length > 0) {
+    if (ast.name === "containsAny" || ast.name === "contains" && strings.length === 1) {
+      const parts = strings.map((s) => leaf2("contains", s));
+      return parts.length === 1 ? parts[0] : { or: parts };
+    }
+  }
+  refuse(`${target.label}: ${ast.name}() \uC740 \uC62E\uAE30\uC9C0 \uC54A\uC2B5\uB2C8\uB2E4`);
+}
+function negate(filter) {
+  if (isPendingRange(filter)) refuse("\uC0C1\uB300 \uAE30\uAC04 \uC870\uAC74\uC758 \uBD80\uC815\uC740 \uC62E\uAE30\uC9C0 \uC54A\uC2B5\uB2C8\uB2E4");
+  if (Array.isArray(filter["and"])) return { or: filter["and"].map(negate) };
+  if (Array.isArray(filter["or"])) return { and: filter["or"].map(negate) };
+  const flips = {
+    equals: "does_not_equal",
+    does_not_equal: "equals",
+    contains: "does_not_contain",
+    does_not_contain: "contains",
+    is_empty: "is_not_empty",
+    is_not_empty: "is_empty"
+  };
+  for (const [key, cond] of Object.entries(filter)) {
+    if (key === "property" || key === "timestamp" || !cond || typeof cond !== "object") continue;
+    if (key === "date" || key === "created_time" || key === "last_edited_time" || key === "number") {
+      if (!("is_empty" in cond) && !("is_not_empty" in cond)) {
+        refuse("\uB0A0\uC9DC \xB7 \uC22B\uC790 \uBE44\uAD50\uC758 \uBD80\uC815\uC740 \uC62E\uAE30\uC9C0 \uC54A\uC2B5\uB2C8\uB2E4 \u2014 \uBC18\uB300 \uBE44\uAD50\uB85C \uBC14\uAFD4 \uC4F0\uC138\uC694");
+      }
+    }
+    const [op, value] = Object.entries(cond)[0] ?? [];
+    const flipped = op === void 0 ? void 0 : flips[op];
+    if (!flipped) refuse(`'${String(op)}' \uC870\uAC74\uC758 \uBD80\uC815\uC740 \uC62E\uAE30\uC9C0 \uC54A\uC2B5\uB2C8\uB2E4`);
+    return { ...filter, [key]: { [flipped]: flipped.startsWith("is_") ? true : value } };
   }
-  const nextFullAt = nextFullReconcileAt(state.lastFullPullAt, state.fullReconcileIntervalSec);
-  if (nextFullAt === null || Date.parse(nextFullAt) <= options.now) {
-    if (!options.deferDue) return { kind: "full", reason: "due" };
-    return {
-      kind: "incremental",
-      since: state.lastPullAt,
-      lastFullAt: state.lastFullPullAt,
-      nextFullAt: null
-    };
+  refuse("\uBD80\uC815\uD560 \uC870\uAC74\uC744 \uCC3E\uC9C0 \uBABB\uD588\uC2B5\uB2C8\uB2E4");
+}
+function targetOf(ref, schema) {
+  if (ref.scope === "file") {
+    const label = `file.${ref.name}`;
+    const timestamp = notionTimestampOf(label);
+    if (timestamp) return { head: { timestamp }, type: timestamp, label };
+    const title = Object.values(schema).find((p) => p.type === "title");
+    if (label === BASES_TITLE && title) {
+      return { head: { property: decodePropertyId(title.id) }, type: "title", label };
+    }
+    refuse(`${label} \uC740 Notion \uC18D\uC131\uC774 \uC544\uB2C8\uB77C \uC62E\uAE30\uC9C0 \uC54A\uC2B5\uB2C8\uB2E4`);
   }
+  const prop = Object.hasOwn(schema, ref.name) ? schema[ref.name] : void 0;
+  if (!prop) refuse(`'${ref.name}' \uC740 \uC774 DB \uC758 \uC18D\uC131\uC774 \uC544\uB2D9\uB2C8\uB2E4`);
   return {
-    kind: "incremental",
-    since: state.lastPullAt,
-    lastFullAt: state.lastFullPullAt,
-    nextFullAt
-  };
-}
-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, deletionsChecked = false) {
-  return scan.kind === "full" ? {
-    kind: "full",
-    reason: scan.reason,
-    lastFullAt: lastFullPullAt,
-    nextFullAt: null,
-    deletionsDeferred: false
-  } : {
-    kind: "incremental",
-    lastFullAt: scan.lastFullAt,
-    nextFullAt: scan.nextFullAt,
-    deletionsDeferred: deleteSync && !deletionsChecked
+    head: { property: decodePropertyId(prop.id) },
+    type: prop.type,
+    label: `\uC18D\uC131 '${ref.name}'`
   };
 }
-var ALL_DATABASES = { kind: "all" };
-function selectsDatabase(selection, databaseId) {
-  return selection.kind === "all" || selection.ids.has(compactNotionId(databaseId));
+function isPendingRange(filter) {
+  return typeof filter["pending"] === "object" && filter["pending"] !== null;
 }
-function parsePendingDatabases(raw) {
-  if (!raw) return /* @__PURE__ */ new Set();
-  try {
-    const parsed = JSON.parse(raw);
-    if (!Array.isArray(parsed)) return /* @__PURE__ */ new Set();
-    return new Set(
-      parsed.filter((id) => typeof id === "string").map((id) => compactNotionId(id))
-    );
-  } catch {
-    return /* @__PURE__ */ new Set();
+function mergeRelativeRanges(items) {
+  const out = [...items];
+  for (const [range, { toward, span }] of Object.entries(RELATIVE_DATE_RANGES)) {
+    const [lowText, highText] = toward === "past" ? [squash(`today() - "${span}"`), "today()"] : ["today()", squash(`today() + "${span}"`)];
+    for (let i = 0; i < out.length; i++) {
+      const low = out[i];
+      if (!isPendingRange(low) || low.pending.symbol !== ">=" || low.pending.text !== lowText)
+        continue;
+      const j = out.findIndex(
+        (high, k) => k !== i && isPendingRange(high) && high.pending.symbol === "<=" && high.pending.text === highText && JSON.stringify(high.pending.target.head) === JSON.stringify(low.pending.target.head)
+      );
+      if (j < 0) continue;
+      const { target } = low.pending;
+      out[i] = { ...target.head, [target.type]: { [range]: {} } };
+      out.splice(j, 1);
+    }
   }
+  return out;
 }
-function serializePendingDatabases(ids) {
-  return JSON.stringify([...ids].sort());
+function squash(text) {
+  return text.replace(/\s+/g, "");
 }
-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));
-  }
+function depthOf(filter) {
+  const children = filter["and"] ?? filter["or"];
+  if (!Array.isArray(children)) return 0;
+  return 1 + Math.max(0, ...children.map(depthOf));
 }
-var DatabasePullLedger = class {
-  constructor(selection, pending) {
-    this.selection = selection;
-    this.pending = pending;
-  }
-  selection;
-  pending;
-  settled = /* @__PURE__ */ new Set();
-  unfinished = /* @__PURE__ */ new Set();
-  skippedCount = 0;
-  /** 이제 동기화하는 DB — 알면 대기를 이것으로 좁힌다. */
-  syncing = null;
-  /** 이 DB 를 조회하나 — 새로 발견한 DB 는 부른 쪽이 따로 조회한다(받은 적이 없다). */
-  selects(databaseId) {
-    return selectsDatabase(this.selection, databaseId);
-  }
-  /** 바뀐 것이 보이지 않아 조회하지 않았다. */
-  skip() {
-    this.skippedCount++;
+
+// src/sync/base-view-push.ts
+var PROPERTY_REQUEST_KEYS = [
+  "property_id",
+  "visible",
+  "width",
+  "wrap",
+  "status_show_as",
+  "card_property_width_mode",
+  "date_format",
+  "time_format"
+];
+var REQUIRED_CONFIGURATION_KEYS = ["group_by", "date_property_id"];
+var BaseViewEdits = class {
+  constructor(stateDb, vaultFs, notionClient) {
+    this.vaultFs = vaultFs;
+    this.notionClient = notionClient;
+    this.bases = new DbBaseFiles(stateDb);
   }
-  /** 받았거나 · 이제 없어서 뺐다 — 다시 조회할 것이 없다. */
-  settle(databaseId) {
-    this.settled.add(compactNotionId(databaseId));
+  vaultFs;
+  notionClient;
+  bases;
+  /** 고친 `.base` 를 찾아 보낼 것을 정한다 — Notion 은 고친 보기만 읽는다. */
+  async plan(inScope = () => true) {
+    const planned = [];
+    const refused = [];
+    const refuse2 = (path, error) => {
+      refused.push({
+        path,
+        operation: "update",
+        error: `.base \uC758 \uBCF4\uAE30\uB97C Notion \uC5D0 \uC62C\uB9AC\uC9C0 \uC54A\uC558\uC2B5\uB2C8\uB2E4 \u2014 ${error}`
+      });
+    };
+    for (const [databaseId, base] of this.bases.all()) {
+      if (!base.views || !inScope(base.basePath)) continue;
+      const content = await this.vaultFs.readFile(base.basePath).catch(() => null);
+      if (content === null) continue;
+      const hash = computeHash(content);
+      if (hash === base.hash) continue;
+      const parsed = readBaseFile(content);
+      if (!parsed) {
+        refuse2(base.basePath, "YAML \uB85C \uC77D\uC744 \uC218 \uC5C6\uC2B5\uB2C8\uB2E4");
+        continue;
+      }
+      const matched = matchViews(base.views, parsed.views);
+      const edits = parsed.views.flatMap((view, i) => {
+        const record = matched[i];
+        if (!record) return [];
+        const edited = pushableOf(view);
+        const changed = changedFields(record, edited);
+        return changed.length > 0 ? [{ record, edited, changed }] : [];
+      });
+      if (edits.length === 0) continue;
+      const meta = await this.notionClient.getDatabaseMeta(databaseId);
+      if (meta.dataSources.length > 1) {
+        refuse2(base.basePath, "\uB370\uC774\uD130 \uC18C\uC2A4\uAC00 \uC5EC\uB7FF\uC778 DB \uC758 \uBCF4\uAE30\uB294 Notion \uC5D0\uC11C \uBC14\uAFB8\uC138\uC694");
+        continue;
+      }
+      const schema = await this.notionClient.getDatabaseSchemaFull(databaseId, meta);
+      const views = [];
+      let allPlanned = true;
+      for (const { record, edited, changed } of edits) {
+        const label = `\uBCF4\uAE30 '${record.name}'`;
+        let live;
+        try {
+          live = await this.notionClient.getView(record.viewId);
+        } catch (error) {
+          if (!isNotionObjectNotFound(error)) throw error;
+          live = null;
+        }
+        if (!live) {
+          refuse2(base.basePath, `${label}: Notion \uC5D0\uC11C \uC9C0\uC6B4 \uBCF4\uAE30\uC785\uB2C8\uB2E4`);
+          allPlanned = false;
+          continue;
+        }
+        if (viewFingerprint(live) !== record.notion) {
+          refuse2(
+            base.basePath,
+            `${label}: \uADF8 \uC0AC\uC774 Notion \uC5D0\uC11C\uB3C4 \uC774 \uBCF4\uAE30\uB97C \uACE0\uCCE4\uC2B5\uB2C8\uB2E4. \uACE0\uCE5C \uB0B4\uC6A9\uC744 \uC62E\uACA8 \uC801\uACE0 \uC774 \uD30C\uC77C\uC744 \uC9C0\uC6B4 \uB4A4 pull \uD558\uBA74 \uC0C8\uB85C \uBC1B\uC2B5\uB2C8\uB2E4`
+          );
+          allPlanned = false;
+          continue;
+        }
+        const built = buildRequest(record, edited, changed, live, schema);
+        if (!built.ok) {
+          refuse2(base.basePath, `${label}: ${built.error}`);
+          allPlanned = false;
+          continue;
+        }
+        views.push({
+          viewId: record.viewId,
+          request: built.request,
+          edit: {
+            path: base.basePath,
+            view: edited.name,
+            ...edited.name !== record.name ? { from: record.name } : {},
+            changed
+          },
+          record: {
+            viewId: record.viewId,
+            type: record.type,
+            ...edited,
+            ...record.lossyFilter && !changed.includes("filter") ? { lossyFilter: true } : {},
+            notion: record.notion
+          }
+        });
+      }
+      if (views.length === 0) continue;
+      planned.push({
+        databaseId,
+        path: base.basePath,
+        base,
+        hash,
+        complete: allPlanned && matched.filter(Boolean).length === base.views.length && restSignature(parsed, matched) === base.rest,
+        views
+      });
+    }
+    return { planned, refused };
   }
-  /** 조회하다 실패했거나 · 받지 못한 행이 있거나 · 취소로 닿지 못했다 — 다음 pull 이 다시 조회한다. */
-  retry(databaseId) {
-    this.unfinished.add(compactNotionId(databaseId));
+  async apply(planned) {
+    const applied = [];
+    const failed = [];
+    for (const file of planned) {
+      const records = new Map(file.base.views.map((record) => [record.viewId, record]));
+      let allApplied = true;
+      for (const view of file.views) {
+        try {
+          await this.notionClient.updateView(view.viewId, view.request);
+        } catch (error) {
+          allApplied = false;
+          failed.push({
+            path: file.path,
+            operation: "update",
+            error: `\uBCF4\uAE30 '${view.edit.view}' \uB97C Notion \uC5D0 \uC62C\uB9AC\uC9C0 \uBABB\uD588\uC2B5\uB2C8\uB2E4: ${error instanceof Error ? error.message : String(error)}`
+          });
+          continue;
+        }
+        applied.push(view.edit);
+        const after = await this.notionClient.getView(view.viewId).catch(() => null);
+        records.set(view.viewId, {
+          ...view.record,
+          notion: after ? viewFingerprint(after) : view.record.notion
+        });
+      }
+      this.bases.set(file.databaseId, {
+        ...file.base,
+        views: file.base.views.map((record) => records.get(record.viewId) ?? record),
+        // 고친 것을 모두 올렸으면 이 파일은 이제 pull 이 쓴 것과 같은 뜻이다 — 다음 pull 이 Notion 의 모습으로 다시 쓴다.
+        // 남은 것이 있으면 계속 붙잡아 둔다.
+        ...file.complete && allApplied ? { hash: file.hash } : {}
+      });
+    }
+    return { applied, failed };
   }
-  get skipped() {
-    return this.skippedCount;
+};
+function buildRequest(record, edited, changed, live, schema) {
+  const request = {};
+  try {
+    if (changed.includes("name")) {
+      if (!edited.name.trim()) throw new Error("\uBCF4\uAE30 \uC774\uB984\uC774 \uBE44\uC5C8\uC2B5\uB2C8\uB2E4");
+      request.name = edited.name;
+    }
+    if (changed.includes("columns")) request.configuration = columnsOf(edited, live, schema);
+    if (changed.includes("sort")) {
+      request.sorts = edited.sort ? edited.sort.map((s) => ({
+        property: propertyIdOf(s.property, schema, "\uC815\uB82C"),
+        direction: s.direction === "DESC" ? "descending" : "ascending"
+      })) : null;
+    }
+    if (changed.includes("filter")) {
+      if (record.lossyFilter) {
+        throw new Error(
+          "Notion \uD544\uD130\uC5D0 \uBCFC\uD2B8\uB85C \uC62E\uAE30\uC9C0 \uBABB\uD55C \uC870\uAC74\uC774 \uC788\uC5B4 \uBCFC\uD2B8\uC758 \uD544\uD130\uB85C \uB36E\uC9C0 \uC54A\uC2B5\uB2C8\uB2E4. \uD544\uD130\uB294 Notion \uC5D0\uC11C \uACE0\uCE58\uC138\uC694"
+        );
+      }
+      if (edited.filters === void 0) {
+        request.filter = null;
+      } else {
+        const converted = basesFilterToNotion(edited.filters, schema);
+        if (!converted.ok) throw new Error(`\uD544\uD130 \u2014 ${converted.error}`);
+        request.filter = converted.filter;
+      }
+    }
+  } catch (error) {
+    return { ok: false, error: error instanceof Error ? error.message : String(error) };
   }
-  /**
-   * 이제 동기화하는 DB 를 알린다 — 대기를 이것으로 좁힌다. 설정에서 뺐거나 접근 불가로 뺀 DB 를 영영
-   * 들고 있지 않는다. 알리지 않으면(발견이 멈춤 등) 좁히지 않는다 — 모르는 것을 버리지 않는다.
-   */
-  keepOnly(databaseIds) {
-    this.syncing = new Set([...databaseIds].map((id) => compactNotionId(id)));
+  return { ok: true, request };
+}
+function columnsOf(edited, live, schema) {
+  if (!edited.order) throw new Error("\uC5F4 \uBAA9\uB85D(order)\uC744 \uC9C0\uC6B4 \uBCF4\uAE30\uB294 \uC62C\uB9AC\uC9C0 \uC54A\uC2B5\uB2C8\uB2E4");
+  const configuration = live.configuration ?? {};
+  const liveEntries = Array.isArray(configuration["properties"]) ? configuration["properties"] : [];
+  const entryOf = (id) => {
+    const found2 = liveEntries.find(
+      (entry) => decodePropertyId(String(entry["property_id"])) === id
+    );
+    const out = { property_id: id };
+    for (const key of PROPERTY_REQUEST_KEYS) {
+      if (found2 && key !== "property_id" && found2[key] !== void 0 && found2[key] !== null) {
+        out[key] = found2[key];
+      }
+    }
+    return out;
+  };
+  const title = Object.values(schema).find((prop) => prop.type === "title");
+  const shown = [];
+  for (const column of edited.order) {
+    if (column === BASES_TITLE) continue;
+    if (isRangeEnd(column, schema)) continue;
+    const id = propertyIdOf(column, schema, "\uC5F4");
+    if (title && id === decodePropertyId(title.id)) continue;
+    if (!shown.includes(id)) shown.push(id);
+  }
+  const titleId = title ? decodePropertyId(title.id) : void 0;
+  const properties = [
+    ...titleId ? [entryOf(titleId)] : [],
+    ...shown.map((id) => ({ ...entryOf(id), visible: true })),
+    ...liveEntries.map((entry) => decodePropertyId(String(entry["property_id"]))).filter((id) => id !== titleId && !shown.includes(id)).map((id) => ({ ...entryOf(id), visible: false }))
+  ];
+  return {
+    type: configuration["type"] ?? live.type,
+    ...Object.fromEntries(
+      REQUIRED_CONFIGURATION_KEYS.filter((key) => configuration[key] !== void 0).map((key) => [
+        key,
+        configuration[key]
+      ])
+    ),
+    properties
+  };
+}
+function propertyIdOf(column, schema, where) {
+  if (column === BASES_TITLE) {
+    const title = Object.values(schema).find((prop2) => prop2.type === "title");
+    if (title) return decodePropertyId(title.id);
   }
-  /** 다음 pull 의 대기 — 지난 대기에서 받은 것을 빼고 이번에 받지 못한 것을 더한다. */
-  nextPending() {
-    const next = new Set([...this.pending].filter((id) => !this.settled.has(id)));
-    for (const id of this.unfinished) next.add(id);
-    const syncing = this.syncing;
-    return syncing ? new Set([...next].filter((id) => syncing.has(id))) : next;
+  if (notionTimestampOf(column)) {
+    throw new Error(
+      `${where} '${column}' \u2014 Notion \uBCF4\uAE30\uB294 \uB9CC\uB4E0 \xB7 \uACE0\uCE5C \uC2DC\uAC01 \uC815\uB82C\uC744 API \uB85C \uBC1B\uC9C0 \uC54A\uC2B5\uB2C8\uB2E4. Notion \uC5D0\uC11C \uBC14\uAFB8\uC138\uC694`
+    );
   }
-};
+  const prop = Object.hasOwn(schema, column) ? schema[column] : void 0;
+  if (!prop) throw new Error(`${where} '${column}' \uC740 \uC774 DB \uC758 Notion \uC18D\uC131\uC774 \uC544\uB2D9\uB2C8\uB2E4`);
+  return decodePropertyId(prop.id);
+}
+function isRangeEnd(column, schema) {
+  if (!column.endsWith(RANGE_END_SUFFIX) || Object.hasOwn(schema, column)) return false;
+  const start = column.slice(0, -RANGE_END_SUFFIX.length);
+  return Object.hasOwn(schema, start) && schema[start].type === "date";
+}
 
 // src/sync/row-schema-cache.ts
 var RowSchemaCache = class {
-  constructor(loadSchema, wikilinkResolver, createMapper = () => new PropertyMapper(), loadPeople) {
+  constructor(loadSchema, wikilinkResolver, createMapper = () => new PropertyMapper(), loadPeople, loadRowSource = async () => null) {
     this.loadSchema = loadSchema;
     this.wikilinkResolver = wikilinkResolver;
     this.createMapper = createMapper;
     this.loadPeople = loadPeople;
+    this.loadRowSource = loadRowSource;
   }
   loadSchema;
   wikilinkResolver;
   createMapper;
   loadPeople;
+  loadRowSource;
   mappers = /* @__PURE__ */ new Map();
+  rowSources = /* @__PURE__ */ new Map();
   people = null;
-  mapperFor(databaseId) {
-    const key = compactNotionId(databaseId);
+  /** @param dataSourceId 행이 사는 data source — 주면 그 소스의 스키마로 옮긴다. */
+  mapperFor(databaseId, dataSourceId) {
+    const key = `${compactNotionId(databaseId)}:${dataSourceId ? compactNotionId(dataSourceId) : ""}`;
     const cached = this.mappers.get(key);
     if (cached) return cached;
-    const created = this.loadSchema(databaseId).then(async (schema) => {
+    const created = this.loadSchema(databaseId, dataSourceId ?? void 0).then(async (schema) => {
       const mapper = this.createMapper();
       mapper.setWikilinkResolver(this.wikilinkResolver);
       mapper.loadSchema(schema);
@@ -17592,8 +19350,24 @@ var RowSchemaCache = class {
     });
     return created;
   }
+  /**
+   * 새 행을 둘 data source — 데이터 소스가 여럿인 DB 는 첫 소스. 그런 DB 에 DB 를 부모로 행을 만들면 Notion 이 400 으로
+   * 거절한다(2026-10-29 실측: «Databases with multiple data sources are not supported in this API version»).
+   */
+  rowSourceFor(databaseId) {
+    const key = compactNotionId(databaseId);
+    const cached = this.rowSources.get(key);
+    if (cached) return cached;
+    const loaded = this.loadRowSource(databaseId);
+    this.rowSources.set(key, loaded);
+    loaded.catch(() => {
+      if (this.rowSources.get(key) === loaded) this.rowSources.delete(key);
+    });
+    return loaded;
+  }
   clear() {
     this.mappers.clear();
+    this.rowSources.clear();
     this.people = null;
   }
   /** 사용자 목록을 못 읽으면 이름은 풀지 않는다 — id 로 적힌 사람만 보낸다(예전 동작). */
@@ -18141,7 +19915,7 @@ var DatabaseDiscovery = class {
         failed.push({
           path: pathOf(parentPageId),
           operation: "create",
-          error: `DB ${compactNotionId(dbId).slice(0, 8)} \uB97C \uC77D\uC9C0 \uBABB\uD568 \u2014 \uB2E4\uC74C pull \uC774 \uB2E4\uC2DC \uBCF8\uB2E4: ${error}`
+          error: `DB ${shortNotionId(dbId)} \uB97C \uC77D\uC9C0 \uBABB\uD568 \u2014 \uB2E4\uC74C pull \uC774 \uB2E4\uC2DC \uBCF8\uB2E4: ${error}`
         });
       };
       const register = async (dbId, parentPageId) => {
@@ -18191,10 +19965,11 @@ var DatabaseDiscovery = class {
         nextRetry.parents.push(...retry.parents);
         nextRetry.dbs.push(...retry.dbs);
       } else {
+        const root = this.config.notion.rootPageId;
         const scanIds = scanAll ? [
-          this.config.notion.rootPageId,
+          root,
           ...this.stateDb.getAll().filter((r) => r.notionPageId).map((r) => r.notionPageId)
-        ].filter((id) => !this._bodyReadPages.has(normalizeNotionId(id))) : retry.parents;
+        ].filter((id) => !this._bodyReadPages.has(normalizeNotionId(id))) : options.rescanRoot && !retry.parents.some((id) => notionIdsEqual(id, root)) ? [root, ...retry.parents] : retry.parents;
         if (scanIds.length > 0) {
           const { found: found2, unread } = await this.discoverChildDatabases(scanIds);
           for (const { dbId, parentPageId } of found2) {
@@ -19456,7 +21231,7 @@ function rewriteTarget(target, source, context, kind) {
   const shown = keepExtension ? destination : destination.slice(0, -".md".length);
   let next;
   if (resolved.relative) {
-    next = relativePath(folderOf4(source.to), shown);
+    next = relativePath(folderOf5(source.to), shown);
     if (!linkpath.startsWith("./") && next.startsWith("./")) next = next.slice(2);
   } else if (style === "name") {
     const name = baseName3(shown);
@@ -19478,14 +21253,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(folderOf4(sourcePath))}${candidate}`;
+      const local = `${folderPrefix(folderOf5(sourcePath))}${candidate}`;
       return matches.includes(local) ? found(local, linkpath) : null;
     }
   }
   return null;
 }
 function resolveRelative(linkpath, sourcePath, files) {
-  const joined = normalizeSegments(`${folderPrefix(folderOf4(sourcePath))}${linkpath}`);
+  const joined = normalizeSegments(`${folderPrefix(folderOf5(sourcePath))}${linkpath}`);
   if (joined === null) return null;
   for (const candidate of withExtension(joined)) {
     if (files.has(candidate)) return { ...found(candidate, linkpath), relative: true };
@@ -19544,7 +21319,7 @@ function relativePath(from, to) {
 function encodeMarkdownTarget(next, original) {
   return original.includes("%") || next.includes(" ") ? next.replace(/ /g, "%20") : next;
 }
-function folderOf4(path) {
+function folderOf5(path) {
   const slash = path.lastIndexOf("/");
   return slash === -1 ? "" : path.slice(0, slash);
 }
@@ -20495,15 +22270,15 @@ var DatabaseCreator = class {
    */
   async addStatus(dataSourceId, status, folder) {
     const groupOf = /* @__PURE__ */ new Map();
-    for (const group of status.groups ?? []) {
-      for (const option of group.options) groupOf.set(option, group.name);
+    for (const group2 of status.groups ?? []) {
+      for (const option of group2.options) groupOf.set(option, group2.name);
     }
     const unknown = [];
     const options = status.options.map((option) => {
-      const group = groupOf.get(option.name);
-      if (group === void 0) return option;
-      if (NOTION_STATUS_GROUPS.includes(group)) return { ...option, group };
-      unknown.push(`${option.name}(${group})`);
+      const group2 = groupOf.get(option.name);
+      if (group2 === void 0) return option;
+      if (NOTION_STATUS_GROUPS.includes(group2)) return { ...option, group: group2 };
+      unknown.push(`${option.name}(${group2})`);
       return option;
     });
     await this.notionClient.updateDataSourceProperties(dataSourceId, {
@@ -21573,7 +23348,8 @@ var PagePusher = class {
       );
     }
     const title = noteTitle(current.data, path);
-    const mapper = await this.rowSchemas.mapperFor(databaseId);
+    const source = await this.rowSchemas.rowSourceFor(databaseId);
+    const mapper = await this.rowSchemas.mapperFor(databaseId, source);
     const changes = diffRowProperties(null, current.data);
     const { properties, skipped } = mapper.toNotionPropertyChanges(changes, title, {
       current: current.data,
@@ -21629,7 +23405,8 @@ var PagePusher = class {
       title,
       conversionResult.content,
       properties,
-      { path, frontmatter: current.data }
+      { path, frontmatter: current.data },
+      source
     );
     const { page } = created;
     const mapping = this.stateDb.upsert({
@@ -21761,8 +23538,8 @@ var PagePusher = class {
         `frontmatter \uB97C \uC77D\uC9C0 \uBABB\uD574 \uD589\uC744 \uBCF4\uB0B4\uC9C0 \uC54A\uC74C (${path}): ${error instanceof Error ? error.message : String(error)}`
       );
     }
-    const mapper = await this.rowSchemas.mapperFor(databaseId);
     const remote = await this.livePage(record);
+    const mapper = await this.rowSchemas.mapperFor(databaseId, dataSourceIdOf(remote));
     const drift = options.overwriteRemote ? "none" : await this.drift.remoteDrift(record, remote);
     const against = options.overwriteRemote ? this.remoteRowState(mapper, remote) : this.baseRowState(record);
     const title = noteTitle(current.data, path);
@@ -21937,7 +23714,8 @@ var PagePusher = class {
    * 버린 맨 앞 `# H1` 을 호출측이 매핑을 적은 뒤 되살린다({@link restoreCreatedHeading}). 블록으로
    * 보냈으면 null 이다 — 블록은 보낸 그대로 생긴다.
    */
-  async pushCreatePage(parentId, parentType, title, markdownContent, properties, note) {
+  async pushCreatePage(parentId, parentType, title, markdownContent, properties, note, dataSourceId) {
+    const parentSource = dataSourceId ? { dataSourceId } : {};
     const decorate2 = async (page2) => await this.decorations.push(page2.id, note.path, note.frontmatter, {}) ?? page2;
     if (this.config.conversion.preferMarkdownApi !== false) {
       const deferred = deferSyncedReferences(obsidianToNotionEnhanced(markdownContent));
@@ -21952,7 +23730,8 @@ var PagePusher = class {
           parentType,
           title,
           markdown,
-          properties
+          properties,
+          ...parentSource
         })
       );
       return { page: page2, markdown, syncedRefs: deferred.refs, syncedRefText: deferred.removed };
@@ -21963,7 +23742,8 @@ var PagePusher = class {
         parentId,
         parentType,
         title,
-        properties
+        properties,
+        ...parentSource
       })
     );
     if (blocks.length > 0) {
@@ -23246,11 +25026,21 @@ var RemoteDetector = class _RemoteDetector {
   _moved = /* @__PURE__ */ new Map();
   // 증분 감지가 search 로 살아 있다고 본 페이지(압축 id) — 삭제 확인이 다시 묻지 않는다.
   _seenAlive = /* @__PURE__ */ new Set();
+  // 이번 감지에서 루트의 자식이 바뀌었을 수 있나 — {@link rootChanged}.
+  _rootChanged = false;
   // 이번 감지가 삭제를 물은 뒤의 커서 — pull 이 마칠 때 적는다({@link saveDeletionSweep}). undefined 면 묻지 않았다.
   _sweepCursor;
   // 이번 감지가 추적 중인 것을 모두 물었나 — 그러면 증분이어도 미룬 삭제가 없다.
   _sweptAll = false;
   /** 이번 감지에서 자식 페이지를 가진 것으로 본 페이지인가 — 폴더노트 판정의 1차 근거. */
+  /**
+   * 루트 바로 아래에 새 DB 가 생겼을 수 있나 — 증분 search 에 루트가 들었거나 전체 대조다. 루트는 받는 노트가 아니라
+   * 본문을 읽지 않아, 루트 바로 아래 새 DB 는 `pull --force` 만 찾았다(2026-10-29 실측 — DB 를 만들면 루트의 수정
+   * 시각이 바뀐다). 이때 DB 발견이 루트의 자식을 한 번 훑는다.
+   */
+  rootChanged() {
+    return this._rootChanged;
+  }
   hasChildPages(pageId) {
     return this._childParentIds.has(normalizeNotionId(pageId));
   }
@@ -23355,6 +25145,7 @@ var RemoteDetector = class _RemoteDetector {
    */
   async detectRemote(scan, options) {
     this._seenAlive.clear();
+    this._rootChanged = scan.kind === "full";
     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);
@@ -23597,7 +25388,10 @@ var RemoteDetector = class _RemoteDetector {
           databaseIds.add(compactNotionId(page.parentDatabaseId));
           continue;
         }
-        if (notionIdsEqual(page.id, this.config.notion.rootPageId)) continue;
+        if (notionIdsEqual(page.id, this.config.notion.rootPageId)) {
+          this._rootChanged = true;
+          continue;
+        }
         throwIfAborted(options.signal);
         try {
           const parentId = await extractParentId(this.notionClient, page);
@@ -23850,7 +25644,7 @@ function draftFolderDatabase(input) {
   let index = 0;
   for (const [name, list] of values) {
     if (NON_PROPERTY_KEYS.has(name)) continue;
-    if (isRangeEnd(name, values)) continue;
+    if (isRangeEnd2(name, values)) continue;
     if (name === DEFAULT_TITLE_PROPERTY) {
       skipped.push({ what: name, reason: "\uC81C\uBAA9 \uC18D\uC131\uACFC \uC774\uB984\uC774 \uAC19\uB2E4 \u2014 \uC774\uB984\uC744 \uBC14\uAFB8\uBA74 \uC18D\uC131\uC774 \uB41C\uB2E4" });
       continue;
@@ -23967,7 +25761,7 @@ function collectValues(notes) {
   }
   return out;
 }
-function isRangeEnd(name, values) {
+function isRangeEnd2(name, values) {
   if (!name.endsWith(RANGE_END_SUFFIX)) return false;
   const start = values.get(name.slice(0, -RANGE_END_SUFFIX.length));
   return start !== void 0 && start.length > 0 && start.every(isFrontmatterDate);
@@ -24026,7 +25820,7 @@ ${text}
     return [];
   }
   const idOf2 = /* @__PURE__ */ new Map();
-  for (const p of properties) idOf2.set(p.type === "title" ? "file.name" : p.name, p.id);
+  for (const p of properties) idOf2.set(p.type === "title" ? BASES_TITLE : p.name, p.id);
   const columnId = (raw) => {
     if (typeof raw !== "string") return void 0;
     return idOf2.get(raw) ?? idOf2.get(raw.replace(/^note\./, ""));
@@ -24152,11 +25946,26 @@ var SyncOrchestrator = class {
     propertyMapper.setWikilinkResolver(wikilinkResolver);
     this.notionClient.setWikilinkResolver(wikilinkResolver);
     this.rowSchemas = new RowSchemaCache(
-      (databaseId) => notionClient.getDatabaseSchema(databaseId),
+      async (databaseId, dataSourceId) => {
+        if (!dataSourceId) return notionClient.getDatabaseSchema(databaseId);
+        const meta = await notionClient.getDatabaseMeta(databaseId);
+        const own = meta.dataSources.length > 1 ? meta.dataSources.find((ds) => notionIdsEqual(ds.id, dataSourceId))?.properties : void 0;
+        return notionClient.getDatabaseSchema(
+          databaseId,
+          own ? { ...meta, properties: own } : meta
+        );
+      },
       wikilinkResolver,
       () => PropertyMapper.fromConfig(config),
-      async () => peopleResolverOf(await notionClient.listUsers())
+      async () => peopleResolverOf(await notionClient.listUsers()),
+      async (databaseId) => {
+        const sources = (await notionClient.getDatabaseMeta(databaseId)).dataSources;
+        return sources.length > 1 ? sources[0].id : null;
+      }
     );
+    this.vaultRenames = new VaultSchemaRenames(stateDb, vaultFs, notionClient);
+    this.sidecarEdits = new SidecarSchemaEdits(stateDb, vaultFs, notionClient);
+    this.viewEdits = new BaseViewEdits(stateDb, vaultFs, notionClient);
     this.drift = new RemoteDriftChecker(
       config,
       stateDb,
@@ -24254,6 +26063,12 @@ var SyncOrchestrator = class {
   databaseSyncer;
   /** DB 행 push 용 — DB 마다 스키마를 읽은 매퍼. 실행마다 비운다(S-01). */
   rowSchemas;
+  /** 볼트에서 바꾼 DB 속성 이름을 Notion 의 열 이름으로(ADR-045). */
+  vaultRenames;
+  /** 볼트에서 고친 사이드카의 속성을 Notion DB 의 열로(ADR-045). */
+  sidecarEdits;
+  /** 볼트에서 고친 `.base` 의 보기를 Notion 보기로(ADR-046). */
+  viewEdits;
   // 이번 실행이 원격을 보는 기준(N-05) — push · pull · status 가 시작할 때 정한다
   // ({@link RunObservation.begin}). 원격 판정과 관측 기록이 같은 값을 쓴다.
   observation;
@@ -24335,20 +26150,31 @@ var SyncOrchestrator = class {
     const excludeSet = options?.excludePaths ? new Set(options.excludePaths) : null;
     const filtered = (options?.paths ? eligible.filter((c) => inAnyPathScope(c.path, options.paths)) : eligible).filter((c) => !excludeSet || !excludeSet.has(c.path));
     const folderMoves = this.planner.pendingFolderMoves(plan).filter((move) => inAnyPathScope(move.to, options?.paths));
+    const inScope = (path) => inAnyPathScope(path, options?.paths) && !excludeSet?.has(path);
+    const sidecarPlan = await this.sidecarEdits.plan(inScope);
+    const plannedEdits = sidecarPlan.planned.map((edit) => edit.edit);
+    const viewPlan = await this.viewEdits.plan(inScope);
+    const plannedViews = viewPlan.planned.flatMap((file) => file.views.map((view2) => view2.edit));
     if (filtered.length === 0 && folderMoves.length === 0) {
       if (!options?.dryRun) await this.completeDatabaseSchemas();
+      const edited2 = options?.dryRun ? { applied: plannedEdits, failed: [] } : await this.sidecarEdits.apply(sidecarPlan.planned);
+      const viewed2 = options?.dryRun ? { applied: plannedViews, failed: [] } : await this.viewEdits.apply(viewPlan.planned);
       return {
         created: 0,
         updated: 0,
         deleted: 0,
         moved: 0,
-        failed: [],
-        duration: Date.now() - startTime
+        failed: [...sidecarPlan.refused, ...edited2.failed, ...viewPlan.refused, ...viewed2.failed],
+        duration: Date.now() - startTime,
+        ...edited2.applied.length > 0 ? { schemaEdits: edited2.applied } : {},
+        ...viewed2.applied.length > 0 ? { viewEdits: viewed2.applied } : {}
       };
     }
     const refusedCreates = this.placement.refusedCreates(filtered, view.lookup);
     const refusedMoves = this.placement.refusedMoves(filtered, view);
     const refusedFailures = [
+      ...sidecarPlan.refused,
+      ...viewPlan.refused,
       ...[...refusedCreates].map(([path, error]) => ({
         path,
         operation: "create",
@@ -24362,9 +26188,14 @@ var SyncOrchestrator = class {
       if (error) refusedFailures.push({ path: move.to, operation: "move", error });
       else movableFolders.push(move);
     }
-    const applicable = filtered.filter(
+    const placeable2 = filtered.filter(
       (c) => !refusedCreates.has(c.path) && !refusedMoves.has(c.path)
     );
+    const renames = await this.vaultRenames.plan(placeable2);
+    refusedFailures.push(...renames.refused);
+    const renameRefused = new Set(renames.refused.map((f) => f.path));
+    const applicable = placeable2.filter((c) => !renameRefused.has(c.path));
+    const plannedRenames = renames.planned.map(({ folder, from, to }) => ({ folder, from, to }));
     if (options?.dryRun) {
       const planned = this.config.sync.deleteSync ? applicable : applicable.filter((c) => c.type !== "deleted");
       const items = [
@@ -24389,16 +26220,30 @@ var SyncOrchestrator = class {
         failed: refusedFailures,
         duration: Date.now() - startTime,
         ...unsentDeletions2.length > 0 ? { unsentDeletions: unsentDeletions2 } : {},
-        ...readOnlySkipped.length > 0 ? { readOnlySkipped } : {}
+        ...readOnlySkipped.length > 0 ? { readOnlySkipped } : {},
+        ...plannedRenames.length > 0 ? { renamedProperties: plannedRenames } : {},
+        ...plannedEdits.length > 0 ? { schemaEdits: plannedEdits } : {},
+        ...plannedViews.length > 0 ? { viewEdits: plannedViews } : {}
       };
     }
     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 edited = await this.sidecarEdits.apply(sidecarPlan.planned);
+    failed.push(...edited.failed);
+    const viewed = await this.viewEdits.apply(viewPlan.planned);
+    failed.push(...viewed.failed);
+    const renamed = await this.vaultRenames.apply(renames.planned);
+    failed.push(...renamed.failed);
+    if (renamed.applied.length > 0 || edited.applied.length > 0) this.rowSchemas.clear();
+    const renameFailed = new Set(renamed.failed.map((f) => f.path));
+    const pushing = applicable.filter(
+      (c) => !renamed.settled.has(c.path) && !renameFailed.has(c.path)
+    );
     const unsentDeletions = [];
     let completed = 0;
-    const total = movableFolders.length + applicable.length;
+    const total = movableFolders.length + pushing.length;
     counts.moved += await this.pusher.pushFolderMoves(
       movableFolders,
       failed,
@@ -24446,14 +26291,10 @@ var SyncOrchestrator = class {
         retryQueue.push(change);
       }
     };
-    const pushedEarly = await this.placement.prepareFolders(
-      applicable,
-      firstAttempt,
-      !options?.paths
-    );
+    const pushedEarly = await this.placement.prepareFolders(pushing, firstAttempt, !options?.paths);
     await this.completeDatabaseSchemas();
     await runPool(
-      applicable.filter((c) => !pushedEarly.has(c.path)),
+      pushing.filter((c) => !pushedEarly.has(c.path)),
       firstAttempt,
       { concurrency: this.config.advanced.concurrency, signal: options?.signal }
     );
@@ -24582,7 +26423,10 @@ var SyncOrchestrator = class {
       failed,
       duration: Date.now() - startTime,
       readOnlySkipped: this.pusher.takeReadOnlySkips(),
-      ...unsentDeletions.length > 0 ? { unsentDeletions } : {}
+      ...unsentDeletions.length > 0 ? { unsentDeletions } : {},
+      ...renamed.applied.length > 0 ? { renamedProperties: renamed.applied } : {},
+      ...edited.applied.length > 0 ? { schemaEdits: edited.applied } : {},
+      ...viewed.applied.length > 0 ? { viewEdits: viewed.applied } : {}
     };
   }
   /**
@@ -24667,6 +26511,9 @@ var SyncOrchestrator = class {
     this.puller.beginPull();
     this.rowSchemas.clear();
     this.databaseSyncer.takeRestoredRows();
+    this.databaseSyncer.takeSchemaFollowed();
+    this.databaseSyncer.takeHeldSidecars();
+    this.databaseSyncer.takeHeldBases();
     const emptyResult = {
       created: 0,
       updated: 0,
@@ -24746,6 +26593,9 @@ var SyncOrchestrator = class {
       await this.puller.removeVacatedFolders();
       const renamedRows = this.databaseSyncer.takeRenamedRows();
       restoredPaths.push(...this.databaseSyncer.takeRestoredRows());
+      const schemaFollowed = this.databaseSyncer.takeSchemaFollowed();
+      const heldSidecars = this.databaseSyncer.takeHeldSidecars();
+      const heldBases = this.databaseSyncer.takeHeldBases();
       const relinked = await this.linkUpdater.apply([...relocated.applied, ...renamedRows.applied]);
       const linkCount = writtenPaths.length > 0 ? await this.resolveNotionLinks(writtenPaths) : 0;
       if (!options?.paths) {
@@ -24771,6 +26621,9 @@ var SyncOrchestrator = class {
         deleted,
         restored,
         ...restoredPaths.length > 0 ? { restoredPaths } : {},
+        ...schemaFollowed.length > 0 ? { schemaFollowed } : {},
+        ...heldSidecars.length > 0 ? { heldSidecars } : {},
+        ...heldBases.length > 0 ? { heldBases } : {},
         conflicts,
         writtenPaths,
         failed,
@@ -24885,6 +26738,7 @@ var SyncOrchestrator = class {
         conflicts,
         {
           forceRediscovery: options?.force === true,
+          rescanRoot: this.detector.rootChanged(),
           paths: options?.paths,
           progress: rowProgress,
           ledger,
@@ -25311,14 +27165,14 @@ function toVaultPath(relativePath2, separator) {
 function compileAll(patterns) {
   return patterns.flatMap((raw) => {
     const pattern = normalizePattern(raw);
-    return pattern === null ? [] : [compile(pattern)];
+    return pattern === null ? [] : [compile2(pattern)];
   });
 }
 function normalizePattern(raw) {
   const pattern = raw.trim().replace(/\\/g, "/").replace(/^(?:\.\/|\/)+/, "").replace(/\/+$/, "");
   return pattern === "" ? null : pattern;
 }
-function compile(pattern) {
+function compile2(pattern) {
   if (pattern === "**" || pattern === "**/*") return { kind: "all" };
   if (!/[*?]/.test(pattern)) return { kind: "prefix", prefix: pattern };
   if (pattern.endsWith("/**") && !/[*?]/.test(pattern.slice(0, -3))) {
@@ -26554,7 +28408,7 @@ var SEP_RE = new RegExp(`^[\\t ]*${COLUMN_SEP_SOURCE}[\\t ]*$`);
 var FENCE_RE = /^[\t ]*(`{3,}|~{3,})/;
 function readColumnLayout(lines) {
   const places = new Array(lines.length);
-  let group = -1;
+  let group2 = -1;
   let fence = null;
   let open = null;
   const close = (end) => {
@@ -26564,7 +28418,7 @@ function readColumnLayout(lines) {
       const until = columns[index + 1]?.line ?? end;
       for (let line = column.line; line < until; line++) {
         places[line] = {
-          group,
+          group: group2,
           index,
           count: columns.length,
           ...column.ratio === void 0 ? {} : { ratio: column.ratio },
@@ -26586,7 +28440,7 @@ function readColumnLayout(lines) {
     }
     if (START_RE.test(line)) {
       close(i);
-      group++;
+      group2++;
       open = { start: i, columns: [] };
       return;
     }
@@ -26612,6 +28466,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, 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 };
+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, shortNotionId, sortEntries, stateDbLockPath, stateDbWalPath, stripMarkdownExtension, summarizeFidelity, systemTimeZone, threeWayMerge, toVaultPath, translateNotionFilter, verifyDatabaseCompleteness, verifyPageCompleteness, wikilinkLookupsIn };
 //# sourceMappingURL=index.js.map
 //# sourceMappingURL=index.js.map