@im-nobsidian/core 0.9.2 → 0.10.0

package/dist/index.d.ts

@@ -511,6 +511,20 @@ interface PullResult {
     readonly linkCount: number;
     /** 원격을 얼마나 훑었나. 원격을 보지 않은 실행(받기 방향이 아님 · 취소)에는 없다. */
     readonly remoteScan?: RemoteScanInfo;
+    /** Notion 에서 옮긴 페이지를 볼트에서 옮긴 것(ADR-039) — dry-run 은 옮길 것. 없으면 옮긴 것이 없다. */
+    readonly moved?: readonly RemoteMove[];
+    /** Notion 에서 옮겼지만 볼트에서 옮기지 않은 것과 그 까닭. */
+    readonly moveSkipped?: readonly RemoteMoveSkip[];
+}
+/** Notion 에서 옮긴 페이지를 볼트에서 옮긴 것 하나 — 노트 하나거나 폴더 하나다. */
+interface RemoteMove {
+    readonly from: string;
+    readonly to: string;
+}
+/** 옮기지 않고 둔 것과 그 까닭 — 볼트에서 직접 옮기면 다음 push 가 Notion 을 맞춘다. */
+interface RemoteMoveSkip {
+    readonly path: string;
+    readonly reason: string;
 }
 interface SyncResult {
     readonly push: PushResult;
@@ -2133,6 +2147,8 @@ interface VaultFS {
      * 이 볼트(연결)가 맡은 경로인가 — 볼트 안의 다른 연결 폴더(ADR-038)는 false. 없으면 전부 맡는다.
      */
     ownsPath?(path: string): boolean;
+    /** 이 폴더 안에 다른 연결 폴더가 있나 — 폴더를 통째로 옮기기 전에 묻는다. 없으면 없다. */
+    holdsOtherConnection?(folder: string): boolean;
     /**
      * 설정(`paths.include` · `paths.exclude`)이나 `.im-nobsidian-ignore` 가 동기화에서 뺀 경로인가 (이슈 #8).
      * 뺀 노트는 목록에 없다 — 추적하던 노트라도 「볼트에서 지움」 으로 보지 않고, pull 이 받거나 되살리지도
@@ -2455,6 +2471,7 @@ declare class SyncOrchestrator {
     private readonly placement;
     private readonly databaseCreator;
     private readonly planner;
+    private readonly remoteMoves;
     private readonly detector;
     private readonly drift;
     private readonly discovery;
@@ -2483,6 +2500,8 @@ declare class SyncOrchestrator {
     /** 볼트의 노트가 마지막으로 올린 내용 그대로인가 — 읽지 못하면(지움 · 옮김) 아니다. */
     private unchangedSincePush;
     pull(options?: PullOptions): Promise<PullResult>;
+    /** 감지가 본, Notion 에서 옮긴 페이지를 볼트에서 옮긴다 — 경로를 좁힌 pull 은 그 범위의 것만. */
+    private followRemoteMoves;
     private executePull;
     sync(options?: SyncOptions): Promise<SyncResult>;
     private executeSync;
@@ -4101,6 +4120,7 @@ declare class ScopedVaultFS implements VaultFS {
      */
     constructor(base: VaultFS, folder: string, connections: readonly string[]);
     ownsPath(path: string): boolean;
+    holdsOtherConnection(folder: string): boolean;
     excludesPath(path: string, kind?: "file" | "folder"): boolean;
     /** 이 연결의 경로 → 볼트 경로. */
     private toBase;
@@ -4283,4 +4303,4 @@ declare function readColumnLayout(lines: readonly string[]): (ColumnPlace | unde
 /** 열 이름표 — `열 2/3 · 50%`. 비율이 없으면 `열 2/3`. */
 declare function columnLabel(place: ColumnPlace): string;
 
-export { BaseFileGenerator, type BaseFileOptions, type BasePropertyOption, type BasePropertySchema, type BaseStatusGroup, type BaseSyncOptions, type BasesFilterNode, type BasesViewMapping, type BasesViewType, BlankLineCollapser, type BookmarkTarget, CONFIG_FILE, type CalendarEntry, type CalloutDesign, CalloutRestorer, CalloutTransformer, ChangeDetector, type ChangeDiff, ColorAnnotator, type ColumnPlace, type CompletenessFailure, type CompletenessLocalSource, type CompletenessOptions, type CompletenessRemoteSource, type CompletenessReport, type Config, ConfigManager, ConfigSchema, type Conflict, ConflictResolver, type ConflictStrategy, ConnectionBoundaryError, ConnectionScopeError, type ConversionContext, type ConversionPath, ConversionPipeline, type ConversionResult, type CoverConfig, type DBEntry, DB_VIEWS_FILE, DB_VIEWS_PATH, DEFAULT_CONFIG, DEFAULT_TITLE_PROPERTY, DEFAULT_WATCH_DEBOUNCE_MS, DIFF_SIGN, type DatabaseCompleteness, type DatabaseSyncConfig, type DatabaseSyncResult, DatabaseSyncer, type DatabaseViewsConfig, type DeferredCode, type DegradeNote, type DesignColor, type DesignLine, type DesignSegment, type DiffHunk, type DiffLine, EmbedResolver, EntryEditor, type FailedOperation, type FidelityClassification, type FidelityContext, type FidelityDefect, type FidelityDefectForm, type FidelitySummary, type FileDownloadResult, FileHandler, type FileInfo, type FileRegistryEntry, type FileStatInfo, type FileSystemEntry, type FileType, type FileUploadResult, FileWatcher, type FilterCondition, type FolderDatabaseReport, type FolderMoveChange, FrontmatterExtractor, FrontmatterGenerator, type FullScanReason, GITIGNORE_ENTRY, type GatedOperation, type GroupByConfig, type GroupedEntries, IGNORE_FILE, INTERNAL_DIR, INTERNAL_DIR_GLOB, type IStateDB, type ImageDownloadResult, ImageHandler, type ImageReference, type InferredProperty, InlineAnnotationPreserver, InlineDBParser, type InlineStyle, type LineDiffOptions, type LineRange, type LocalChange, LocalImageRestorer, type LocalMoveAdoption, type LocalScan, type LocalScanOptions, type Logger, MARKER_BRAND, type MappingResult, type MappingType, MathNormalizer, MentionToWikilink, type MergeConflictRegion, type MergeResult, NOTION_COLOR_NAMES, NOTION_TOKEN_PREFIX, NOTION_TO_BASES_VIEW, NodeVaultFS, type NonMdFileInfo, type NotionBlock, NotionBlockBuilder, NotionClient, type NotionClientOptions, type NotionColor, type NotionPageNode, type NotionRichText, type RichTextItem as NotionRichTextItem, type NotionSidecar, OBSIDIAN_CONFIG_DIR, type OperationType, type PageCompletenessRemoteSource, type PageCompletenessReport, type PageCover, type PageCreationPlan, type PageIcon, PathFilter, type PathFilterConfig, type PendingOperation, PendingWalError, type PlannedRow, type PreserveMarker, PreserveMarkerCollector, PreserveMarkerInjector, type Processor, type ProcessorInput, type ProcessorMetadata, type ProcessorOutput, type ProgressCallback, type ProgressItem, PropertiesTableInjector, PropertiesTableRestorer, PropertyMapper, type PropertyOption, type PropertySchema, type PropertyValue, type PullOptions, type PullResult, type PushOptions, type PushResult, RENDER_LINE_RULES, type RecordPendingInput, type RegisterFileInput, type RemoteChange, type RemoteObservation, type RemoteScanInfo, type RenameHints, type RenameKind, type RenderFinding, type RenderLineRule, type ResolutionChoice, type ResolutionResult, type RichTextSegment, type RowProgress, SAVED_STATE_TABLES_QUERY, SEPARATOR_BODY, STATE_DB_FILE, STATE_DB_MIGRATIONS, STATE_DB_PATH, SavedStateDbError, ScopedVaultFS, SidecarGenerator, type SidecarProperty, type SidecarView, StateDB, StateDbLockedError, type StateDbMigration, type StateDbTool, StateDbUnavailableError, StateLock, type StateLockClaim, type StateLockOwner, type StatusOptions, type StatusResult, type StyledRange, SyncBusyError, type SyncDirection, type SyncOptions, SyncOrchestrator, type SyncRecord, type SyncResult, type SyncStatus, type TableLineDesign, type TranslationResult, TreeMapper, UnsupportedBlockStripper, type UpsertSyncRecord, type VaultCompletenessReport, type VaultFS, type ViewConfig, ViewDataProvider, type ViewPropertyConfig, type ViewRenderData, type ViewType, WIKILINK_LOOKUPS, type WatchSyncOptions, type WatchSyncScope, WatchSyncService, type WikilinkEntry, type WikilinkLookup, WikilinkResolver, applicableChoices, assertNoPendingWal, basesViewMappingOf, basesViewTypeOf, choiceForStrategy, classifyBodyFidelity, columnLabel, compactNotionId, computeBufferHash, computeHash, configDirFrom, connectionFolderOf, createDefaultPipeline, extractCalendarEntries, filterByMonth, filterEntries, findConnectionFolders, formatUnifiedDiff, generateColorCSS, generateId, getLogger, getNotionBgColor, getNotionColor, getVisibleProperties, groupEntries, hasColumnLayout, hasDesignMarker, inAnyPathScope, isInternalPath, isMarkdownPath, isRemoteDeletion, lineDiff, lintRenderedMarkdown, matchesPathScope, normalizeNotionId, normalizeVaultPath, noteNameFromPath, notionIdFromInput, notionIdsEqual, operationLabel, parseDesignColor, pendingWalBytes, readColumnLayout, readDesignLine, resolvePropertyName, sanitizeFileName, setLogger, sortEntries, stateDbLockPath, stateDbWalPath, stripMarkdownExtension, summarizeFidelity, systemTimeZone, threeWayMerge, toVaultPath, translateNotionFilter, verifyDatabaseCompleteness, verifyPageCompleteness, wikilinkLookupsIn };
+export { BaseFileGenerator, type BaseFileOptions, type BasePropertyOption, type BasePropertySchema, type BaseStatusGroup, type BaseSyncOptions, type BasesFilterNode, type BasesViewMapping, type BasesViewType, BlankLineCollapser, type BookmarkTarget, CONFIG_FILE, type CalendarEntry, type CalloutDesign, CalloutRestorer, CalloutTransformer, ChangeDetector, type ChangeDiff, ColorAnnotator, type ColumnPlace, type CompletenessFailure, type CompletenessLocalSource, type CompletenessOptions, type CompletenessRemoteSource, type CompletenessReport, type Config, ConfigManager, ConfigSchema, type Conflict, ConflictResolver, type ConflictStrategy, ConnectionBoundaryError, ConnectionScopeError, type ConversionContext, type ConversionPath, ConversionPipeline, type ConversionResult, type CoverConfig, type DBEntry, DB_VIEWS_FILE, DB_VIEWS_PATH, DEFAULT_CONFIG, DEFAULT_TITLE_PROPERTY, DEFAULT_WATCH_DEBOUNCE_MS, DIFF_SIGN, type DatabaseCompleteness, type DatabaseSyncConfig, type DatabaseSyncResult, DatabaseSyncer, type DatabaseViewsConfig, type DeferredCode, type DegradeNote, type DesignColor, type DesignLine, type DesignSegment, type DiffHunk, type DiffLine, EmbedResolver, EntryEditor, type FailedOperation, type FidelityClassification, type FidelityContext, type FidelityDefect, type FidelityDefectForm, type FidelitySummary, type FileDownloadResult, FileHandler, type FileInfo, type FileRegistryEntry, type FileStatInfo, type FileSystemEntry, type FileType, type FileUploadResult, FileWatcher, type FilterCondition, type FolderDatabaseReport, type FolderMoveChange, FrontmatterExtractor, FrontmatterGenerator, type FullScanReason, GITIGNORE_ENTRY, type GatedOperation, type GroupByConfig, type GroupedEntries, IGNORE_FILE, INTERNAL_DIR, INTERNAL_DIR_GLOB, type IStateDB, type ImageDownloadResult, ImageHandler, type ImageReference, type InferredProperty, InlineAnnotationPreserver, InlineDBParser, type InlineStyle, type LineDiffOptions, type LineRange, type LocalChange, LocalImageRestorer, type LocalMoveAdoption, type LocalScan, type LocalScanOptions, type Logger, MARKER_BRAND, type MappingResult, type MappingType, MathNormalizer, MentionToWikilink, type MergeConflictRegion, type MergeResult, NOTION_COLOR_NAMES, NOTION_TOKEN_PREFIX, NOTION_TO_BASES_VIEW, NodeVaultFS, type NonMdFileInfo, type NotionBlock, NotionBlockBuilder, NotionClient, type NotionClientOptions, type NotionColor, type NotionPageNode, type NotionRichText, type RichTextItem as NotionRichTextItem, type NotionSidecar, OBSIDIAN_CONFIG_DIR, type OperationType, type PageCompletenessRemoteSource, type PageCompletenessReport, type PageCover, type PageCreationPlan, type PageIcon, PathFilter, type PathFilterConfig, type PendingOperation, PendingWalError, type PlannedRow, type PreserveMarker, PreserveMarkerCollector, PreserveMarkerInjector, type Processor, type ProcessorInput, type ProcessorMetadata, type ProcessorOutput, type ProgressCallback, type ProgressItem, PropertiesTableInjector, PropertiesTableRestorer, PropertyMapper, type PropertyOption, type PropertySchema, type PropertyValue, type PullOptions, type PullResult, type PushOptions, type PushResult, RENDER_LINE_RULES, type RecordPendingInput, type RegisterFileInput, type RemoteChange, type RemoteMove, type RemoteMoveSkip, type RemoteObservation, type RemoteScanInfo, type RenameHints, type RenameKind, type RenderFinding, type RenderLineRule, type ResolutionChoice, type ResolutionResult, type RichTextSegment, type RowProgress, SAVED_STATE_TABLES_QUERY, SEPARATOR_BODY, STATE_DB_FILE, STATE_DB_MIGRATIONS, STATE_DB_PATH, SavedStateDbError, ScopedVaultFS, SidecarGenerator, type SidecarProperty, type SidecarView, StateDB, StateDbLockedError, type StateDbMigration, type StateDbTool, StateDbUnavailableError, StateLock, type StateLockClaim, type StateLockOwner, type StatusOptions, type StatusResult, type StyledRange, SyncBusyError, type SyncDirection, type SyncOptions, SyncOrchestrator, type SyncRecord, type SyncResult, type SyncStatus, type TableLineDesign, type TranslationResult, TreeMapper, UnsupportedBlockStripper, type UpsertSyncRecord, type VaultCompletenessReport, type VaultFS, type ViewConfig, ViewDataProvider, type ViewPropertyConfig, type ViewRenderData, type ViewType, WIKILINK_LOOKUPS, type WatchSyncOptions, type WatchSyncScope, WatchSyncService, type WikilinkEntry, type WikilinkLookup, WikilinkResolver, applicableChoices, assertNoPendingWal, basesViewMappingOf, basesViewTypeOf, choiceForStrategy, classifyBodyFidelity, columnLabel, compactNotionId, computeBufferHash, computeHash, configDirFrom, connectionFolderOf, createDefaultPipeline, extractCalendarEntries, filterByMonth, filterEntries, findConnectionFolders, formatUnifiedDiff, generateColorCSS, generateId, getLogger, getNotionBgColor, getNotionColor, getVisibleProperties, groupEntries, hasColumnLayout, hasDesignMarker, inAnyPathScope, isInternalPath, isMarkdownPath, isRemoteDeletion, lineDiff, lintRenderedMarkdown, matchesPathScope, normalizeNotionId, normalizeVaultPath, noteNameFromPath, notionIdFromInput, notionIdsEqual, operationLabel, parseDesignColor, pendingWalBytes, readColumnLayout, readDesignLine, resolvePropertyName, sanitizeFileName, setLogger, sortEntries, stateDbLockPath, stateDbWalPath, stripMarkdownExtension, summarizeFidelity, systemTimeZone, threeWayMerge, toVaultPath, translateNotionFilter, verifyDatabaseCompleteness, verifyPageCompleteness, wikilinkLookupsIn };

package/dist/index.js

@@ -4656,6 +4656,15 @@ function folderNoteOf(folder) {
 function isFolderRecord(record) {
   return (record.fileType === "folder-note" || record.fileType === "folder-only") && !isMarkdownPath(record.obsidianPath);
 }
+function childFolderOf(record, lookup) {
+  if (isFolderRecord(record) && !lookup.databaseAt(record.obsidianPath)) {
+    return record.obsidianPath;
+  }
+  if (record.fileType === "folder-note" || record.fileType === "folder-only") {
+    return parentFolderOf(record.obsidianPath);
+  }
+  return stripMarkdownExtension(record.obsidianPath);
+}
 function parentFolderOf(path) {
   const slash = path.lastIndexOf("/");
   return slash < 0 ? "" : path.slice(0, slash);
@@ -5217,6 +5226,7 @@ var FrontmatterExtractor = class {
 };
 
 // src/utils/md-regions.ts
+var LIST_MARKER_SOURCE = String.raw`(?:[-*+]|\d{1,9}[.)])`;
 var BLANK_LINE_RE = /\n[ \t]*\n/;
 function computeAnchor(content, idx) {
   const before = content.slice(Math.max(0, idx - 32), idx);
@@ -5255,7 +5265,9 @@ function closingFence(line, open) {
   }
   return { lead: m[1], bar: m[2] };
 }
-var QUOTED_FENCE_OPEN_RE = /^((?:[\t ]*>)*)([\t ]*)((?:[-*+]|\d{1,9}[.)])[\t ]+)?(`{3,}|~{3,})(.*)\r?$/;
+var QUOTED_FENCE_OPEN_RE = new RegExp(
+  String.raw`^((?:[\t ]*>)*)([\t ]*)(${LIST_MARKER_SOURCE}[\t ]+)?(\`{3,}|~{3,})(.*)\r?$`
+);
 var QUOTE_MARK_RE = /^[\t ]*>/;
 var LEADING_SPACE_RE = /^[\t ]*/;
 function stripQuoteMarks(line, depth2) {
@@ -5352,7 +5364,7 @@ function codeLineMask(content) {
   }
   return inCode;
 }
-var TOP_LIST_ITEM_RE = /^ {0,3}(?:[-*+]|\d{1,9}[.)])(?:[\t ]|$)/;
+var TOP_LIST_ITEM_RE = new RegExp(String.raw`^ {0,3}${LIST_MARKER_SOURCE}(?:[\t ]|$)`);
 var INDENTED_CODE_WIDTH = 4;
 function indentedCodeLineMask(content) {
   const lines = content.split("\n");
@@ -5683,7 +5695,9 @@ function withoutPrefix(line, prefix) {
   return null;
 }
 var DOUBLE_DOLLAR_RE = /(?<![\\$])\$\$(?!\$)/g;
-var OWN_LINE_DOLLARS_RE = /^(?:[ \t]*>)*[ \t]*(?:\[![^\]]*\][+-]?[ \t]*|(?:[-*+]|\d+[.)])[ \t]+)?\$\$[ \t]*$/;
+var OWN_LINE_DOLLARS_RE = new RegExp(
+  String.raw`^(?:[ \t]*>)*[ \t]*(?:\[![^\]]*\][+-]?[ \t]*|${LIST_MARKER_SOURCE}[ \t]+)?\$\$[ \t]*$`
+);
 function settleDollars(content, final) {
   return mapOutsideCode(
     content,
@@ -6208,7 +6222,7 @@ function widenAmbiguousFences(lines, blocks) {
   }
   return widened;
 }
-var LIST_ITEM_LINE_RE = /^[\t ]*(?:[-*+]|\d{1,9}[.)])(?:[\t ]|$)/;
+var LIST_ITEM_LINE_RE = new RegExp(String.raw`^[\t ]*${LIST_MARKER_SOURCE}(?:[\t ]|$)`);
 function alignNestedCodeBodies(text) {
   const lines = text.split("\n");
   const blocks = scanContainerBlocks(lines);
@@ -8052,7 +8066,7 @@ function clampCalloutIndent(content) {
   }
   return out.join("\n");
 }
-var BODY_INDENT_RE = /^\t+(?![ \t]*(?:[-*+]|\d+[.)])(?:\s|$))/;
+var BODY_INDENT_RE = new RegExp(String.raw`^\t+(?![ \t]*${LIST_MARKER_SOURCE}(?:\s|$))`);
 function clampBodyIndent(line) {
   return line.replace(BODY_INDENT_RE, CLAMPED_INDENT);
 }
@@ -8253,10 +8267,10 @@ function stripQuotes(s) {
 
 // src/converter/lazy-continuation.ts
 var QUOTE_PREFIX_RE2 = /^[\t >]*>/;
-var LIST_ITEM_RE = /^(?:[-*+]|\d+[.)])(?:[\t ]|$)/;
+var LIST_ITEM_RE = new RegExp(String.raw`^${LIST_MARKER_SOURCE}(?:[\t ]|$)`);
 var NOT_LAZY_RE = /^(?:#{1,6}(?:[\t ]|$)|>|\[!|(?:[-*_][\t ]*){3,}$|\||<br\s*\/?>[\t ]*$|%%)/;
 var NOT_PARAGRAPH_RE = /^(?:#{1,6}(?:[\t ]|$)|(?:[-*_][\t ]*){3,}$|\||<br\s*\/?>[\t ]*$|\$\$|%%)/;
-var LIST_PARAGRAPH_RE = /^(?:[-*+]|\d+[.)])[\t ]+\S/;
+var LIST_PARAGRAPH_RE = new RegExp(String.raw`^${LIST_MARKER_SOURCE}[\t ]+\S`);
 var FENCE_LINE_RE2 = /^(?:`{3,}|~{3,})/;
 function continuesListParagraph(previous, line) {
   const prev = splitQuoted(previous);
@@ -8327,7 +8341,7 @@ var BlockSpacer = class {
     };
   }
 };
-var LIST_ITEM_RE2 = /^[ \t]*(?:[-*+]|\d+[.)])(?:\s|$)/;
+var LIST_ITEM_RE2 = new RegExp(String.raw`^[ \t]*${LIST_MARKER_SOURCE}(?:\s|$)`);
 var QUOTE_RE = /^[ \t]*>/;
 var CALLOUT_START_RE = /^[ \t]*>\s*\[![^\]]*\]/;
 var TABLE_ROW_RE = /^[ \t]*\|/;
@@ -8702,7 +8716,7 @@ var RENDER_LINE_RULES = [
 var SEPARATOR_BODY = "[ \\t:|-]*-{3,}";
 var SEPARATOR_RE = new RegExp(`^[\\t ]*>?[\\t ]*\\|${SEPARATOR_BODY}[ \\t:|-]*\\|`);
 var DEEP_FENCE_RE = /^ {4,}```/;
-var LIST_ITEM_RE3 = /^([\t ]*)([-*+]|\d{1,9}[.)])(?:[\t ]|$)/;
+var LIST_ITEM_RE3 = new RegExp(String.raw`^([\t ]*)(${LIST_MARKER_SOURCE})(?:[\t ]|$)`);
 var CODE_INDENT = 4;
 var FOOTNOTE_CONTENT_WIDTH = 4;
 var ATX_HEADING_RE = /^ {0,3}#{1,6}(?:[\t ]|$)/;
@@ -10209,7 +10223,7 @@ function pipeTablesToNfmTables(content) {
 // src/converter/empty-block.ts
 var EMPTY_BLOCK_LINE_RE = new RegExp(`^(${CONTAINER_PREFIX_SOURCE})<empty-block\\/>[\\t ]*$`);
 var BREAK_LINE_RE = new RegExp(`^(${CONTAINER_PREFIX_SOURCE})<br\\s*\\/?>[\\t ]*$`);
-var LIST_ITEM_RE4 = /^(?:[-*+]|\d+[.)])(?:\s|$)/;
+var LIST_ITEM_RE4 = new RegExp(String.raw`^${LIST_MARKER_SOURCE}(?:\s|$)`);
 function mapProseLines(content, map) {
   const lines = content.split("\n");
   const kinds = classifyContainerLines(lines.map((line) => splitContainerPrefix(line).body));
@@ -11196,7 +11210,7 @@ function unescapeAngleBrackets(content) {
     (segment) => segment.split("\n").map(unescapeLine).join("\n")
   );
 }
-var BLOCK_PREFIX_RE = /^[ \t]*(?:(?:>|[-*+]|\d+[.)])[ \t]*)*$/;
+var BLOCK_PREFIX_RE = new RegExp(String.raw`^[ \t]*(?:(?:>|${LIST_MARKER_SOURCE})[ \t]*)*$`);
 var TAG_START_RE = /[A-Za-z/!?]/;
 function unescapeLine(line) {
   if (!line.includes("\\<") && !line.includes("\\>")) return line;
@@ -15209,16 +15223,16 @@ var PageDecorations = class {
    *
    * @param baseName 내려받은 파일 이름의 앞부분 — 보통 노트 이름
    */
-  async pulled(page, baseName2, download) {
+  async pulled(page, baseName3, download) {
     const out = {};
     const cover = this.notionClient.extractCover(page);
     if (cover) {
-      const local = download ? await this.imageHandler.localizeNotionFileUrl(cover.url, `${baseName2}-cover`) : null;
+      const local = download ? await this.imageHandler.localizeNotionFileUrl(cover.url, `${baseName3}-cover`) : null;
       out.cover = local ? `[[${local}]]` : cover.url;
     }
     const icon = this.notionClient.extractIcon(page);
     if (icon) {
-      const local = download && icon.type === "file" ? await this.imageHandler.localizeNotionFileUrl(icon.value, `${baseName2}-icon`) : null;
+      const local = download && icon.type === "file" ? await this.imageHandler.localizeNotionFileUrl(icon.value, `${baseName3}-icon`) : null;
       out.icon = local ? `[[${local}]]` : icon.value;
     }
     return out;
@@ -16718,6 +16732,10 @@ var ScopedVaultFS = class {
     const joined = normalizeVaultPath(this.folder === "" ? path : `${this.folder}/${path}`);
     return joined !== null && matchesPathScope(joined, this.folder) && connectionFolderOf(joined, this.nested) === null;
   }
+  holdsOtherConnection(folder) {
+    const joined = normalizeVaultPath(this.folder === "" ? folder : `${this.folder}/${folder}`);
+    return joined !== null && this.nested.some((c) => matchesPathScope(c, joined));
+  }
   excludesPath(path, kind) {
     const joined = normalizeVaultPath(this.folder === "" ? path : `${this.folder}/${path}`);
     return joined !== null && (this.base.excludesPath?.(joined, kind) ?? false);
@@ -18587,6 +18605,199 @@ var LocalPlanner = class {
   }
 };
 
+// src/sync/remote-moves.ts
+var MOVABLE_TYPES = /* @__PURE__ */ new Set([
+  "file",
+  "folder-note",
+  "folder-only"
+]);
+function movedInNotion(record, parentId) {
+  return MOVABLE_TYPES.has(record.fileType) && record.notionParentId !== null && !notionIdsEqual(record.notionParentId, parentId);
+}
+var RemoteMoveFollower = class {
+  constructor(config, stateDb, vaultFs, folderLookup) {
+    this.config = config;
+    this.stateDb = stateDb;
+    this.vaultFs = vaultFs;
+    this.folderLookup = folderLookup;
+  }
+  config;
+  stateDb;
+  vaultFs;
+  folderLookup;
+  /**
+   * @param moved 페이지 id → Notion 의 새 부모 페이지 id.
+   * @param options.dryRun 옮길 자리만 정하고 쓰지 않는다.
+   */
+  async follow(moved, options = {}) {
+    const result = { moved: [], skipped: [] };
+    for (const [pageId, parentId] of moved) {
+      const record = this.stateDb.getByNotionId(pageId);
+      if (!record || !movedInNotion(record, parentId)) continue;
+      if (this.vaultFs.excludesPath?.(record.obsidianPath)) continue;
+      let outcome;
+      try {
+        outcome = await this.followOne(record, parentId, options.dryRun === true);
+      } catch (error) {
+        outcome = {
+          path: record.obsidianPath,
+          reason: `\uC62E\uAE30\uC9C0 \uBABB\uD568: ${error instanceof Error ? error.message : String(error)}`
+        };
+      }
+      if ("reason" in outcome) {
+        result.skipped.push(outcome);
+        getLogger().warn(
+          `[Im-Nobsidian] Notion \uC5D0\uC11C \uC62E\uAE34 \uD398\uC774\uC9C0\uB97C \uBCFC\uD2B8\uC5D0\uC11C \uC62E\uAE30\uC9C0 \uC54A\uC74C (${outcome.path}): ${outcome.reason}`
+        );
+      } else if (outcome.moves.length > 0) {
+        result.moved.push(...outcome.moves);
+      }
+    }
+    return result;
+  }
+  async followOne(record, parentId, dryRun) {
+    const skip = (reason) => ({ path: record.obsidianPath, reason });
+    if (this.stateDb.getIncompleteOpByState(record.id, "move")) {
+      return skip(
+        "\uBCFC\uD2B8\uC5D0\uC11C \uC62E\uAE34 \uAC83\uC744 \uC544\uC9C1 \uC62C\uB9AC\uC9C0 \uC54A\uC558\uB2E4 \u2014 \uB2E4\uC74C push \uAC00 Notion \uC744 \uBCFC\uD2B8\uC758 \uC790\uB9AC\uB85C \uC62E\uAE34\uB2E4"
+      );
+    }
+    const folder = this.parentFolder(parentId);
+    if (folder === null) return skip("Notion \uC758 \uC0C8 \uBD80\uBAA8\uAC00 \uBCFC\uD2B8\uC5D0 \uC5C6\uB2E4");
+    const units = this.unitsOf(record);
+    const moves = units.map((from) => ({ from, to: joinPath(folder, baseName2(from)) }));
+    if (moves.every((move) => move.from === move.to)) {
+      if (!dryRun) this.stateDb.setNotionParentId(record.id, parentId);
+      return { moves: [] };
+    }
+    for (const move of moves) {
+      const blocked = await this.blocked(move);
+      if (blocked) return skip(blocked);
+    }
+    if (dryRun) return { moves };
+    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);
+      this.stateDb.setNotionParentId(record.id, parentId);
+    });
+    for (const move of moves) {
+      getLogger().info(
+        `[Im-Nobsidian] Notion \uC5D0\uC11C \uC62E\uAE34 \uD398\uC774\uC9C0\uB97C \uBCFC\uD2B8\uC5D0\uC11C \uC62E\uAE40: ${move.from} \u2192 ${move.to}`
+      );
+    }
+    return { moves };
+  }
+  /** 새 부모 아래의 자식이 놓일 폴더 — 새 페이지를 받을 때와 같은 규칙. 루트면 `""`, 볼트에 없는 부모면 null. */
+  parentFolder(parentId) {
+    if (notionIdsEqual(parentId, this.config.notion.rootPageId)) return "";
+    const parent = this.stateDb.getByNotionId(parentId);
+    return parent ? childFolderOf(parent, this.folderLookup()) : null;
+  }
+  /**
+   * 함께 옮길 것 — 폴더로 추적하는 페이지는 그 폴더, 폴더 노트(`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.vaultFs.exists(move.to) || this.stateDb.getAll().some((r) => within(r.obsidianPath, 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.holdsDatabaseOrConnection(move.from)) {
+      return "\uD3F4\uB354 \uC548\uC5D0 DB \uB098 \uB2E4\uB978 \uC5F0\uACB0\uC774 \uC788\uB2E4 \u2014 DB \uBCF4\uAE30(.base)\uAC00 \uD3F4\uB354 \uACBD\uB85C\uB97C \uD488\uB294\uB2E4. Obsidian \uC5D0\uC11C \uC62E\uAE30\uBA74 \uB2E4\uC74C push \uAC00 Notion \uC744 \uB9DE\uCD98\uB2E4";
+    }
+    return null;
+  }
+  holdsDatabaseOrConnection(folder) {
+    const databases = parseDiscoveredDbs(this.stateDb.getMeta(DISCOVERED_DBS_META_KEY));
+    if (databases.some((db) => within(db.localFolder.replace(/\/+$/, ""), folder))) return true;
+    const baseFiles = this.stateDb.getMeta(DB_BASE_FILES_META_KEY);
+    if (baseFiles) {
+      try {
+        const entries = Object.values(
+          JSON.parse(baseFiles)
+        );
+        if (entries.some((entry) => entry.basePath && within(entry.basePath, folder))) return true;
+      } catch {
+      }
+    }
+    if (this.stateDb.getAll().some((r) => r.fileType === "db-row" && within(r.obsidianPath, folder))) {
+      return true;
+    }
+    return this.vaultFs.holdsOtherConnection?.(folder) ?? false;
+  }
+  /** 옮긴 것 아래의 레코드 · 위키링크 · 보존 마커 · 첨부 기록을 새 경로로 옮겨 적는다. */
+  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) {
+        this.stateDb.deleteWikilink(from);
+        this.stateDb.upsertWikilink({
+          obsidianPath: to,
+          notionPageId: entry.notionPageId,
+          title: wikilinkTitleFromPath(to),
+          aliases: entry.aliases
+        });
+      }
+      const markers = this.stateDb.getPreserveMarkers(from);
+      if (markers.length > 0) {
+        this.stateDb.storePreserveMarkers(to, markers);
+        this.stateDb.storePreserveMarkers(from, []);
+      }
+      if (record.notionPageId) {
+        for (const file of this.stateDb.getFilesByPageId(record.notionPageId)) {
+          if (!within(file.localPath, move.from)) continue;
+          this.stateDb.registerFile({
+            localPath: move.to + file.localPath.slice(move.from.length),
+            notionPageId: file.notionPageId,
+            fileUploadId: file.fileUploadId,
+            fileType: file.fileType,
+            fileHash: file.fileHash,
+            fileSize: file.fileSize
+          });
+          this.stateDb.deleteFileRegistry(file.localPath);
+        }
+      }
+    }
+  }
+};
+function within(path, unit) {
+  return path === unit || path.startsWith(`${unit}/`);
+}
+function baseName2(path) {
+  return path.slice(path.lastIndexOf("/") + 1);
+}
+function joinPath(folder, name) {
+  return folder === "" ? name : `${folder}/${name}`;
+}
+
 // src/sync/change-inspector.ts
 var ChangeInspector = class {
   constructor(stateDb, vaultFs, notionClient, planner, puller) {
@@ -21660,17 +21871,7 @@ var PagePuller = class {
     const parentId = await extractParentId(this.notionClient, page);
     if (!parentId || notionIdsEqual(parentId, this.config.notion.rootPageId)) return "";
     const parentRecord = this.stateDb.getByNotionId(parentId);
-    if (parentRecord) {
-      if (isFolderRecord(parentRecord) && !this.placement.folderLookup().databaseAt(parentRecord.obsidianPath)) {
-        return parentRecord.obsidianPath;
-      }
-      if (parentRecord.fileType === "folder-note" || parentRecord.fileType === "folder-only") {
-        const pathParts = parentRecord.obsidianPath.split("/");
-        pathParts.pop();
-        return pathParts.join("/");
-      }
-      return stripMarkdownExtension(parentRecord.obsidianPath);
-    }
+    if (parentRecord) return childFolderOf(parentRecord, this.placement.folderLookup());
     try {
       const parentPage = await this.notionClient.getPage(parentId);
       const parentTitle = this.notionClient.extractTitle(parentPage);
@@ -22048,6 +22249,9 @@ var RemoteDetector = class _RemoteDetector {
   // 감지가 빠뜨린 자식을 {@link takeUndiscoveredChildren} 가 둘의 차로 고른다.
   _bodyChildren = /* @__PURE__ */ new Map();
   _queued = /* @__PURE__ */ new Set();
+  // Notion 에서 부모가 바뀐 추적 페이지(정규화 id → 새 부모 페이지 id) — pull 이 볼트에서도 옮긴다(ADR-039).
+  // 옮겨도 수정 시각이 바뀌지 않아(실측) 변경으로는 보이지 않는다. 감지마다 다시 채운다.
+  _moved = /* @__PURE__ */ new Map();
   /** 이번 감지에서 자식 페이지를 가진 것으로 본 페이지인가 — 폴더노트 판정의 1차 근거. */
   hasChildPages(pageId) {
     return this._childParentIds.has(normalizeNotionId(pageId));
@@ -22109,6 +22313,16 @@ var RemoteDetector = class _RemoteDetector {
     }
     return changes;
   }
+  /** 이번 감지가 본, Notion 에서 옮긴 추적 페이지 — 페이지 id → 새 부모 페이지 id. */
+  get movedPages() {
+    return this._moved;
+  }
+  /** 받은 부모가 상태 DB 의 것과 다르면 옮긴 페이지로 적는다. */
+  noteParent(pageId, parentId) {
+    const record = this.stateDb.getByNotionId(pageId);
+    if (record && movedInNotion(record, parentId))
+      this._moved.set(normalizeNotionId(pageId), parentId);
+  }
   /** 새 감지를 시작한다 — 지난 실행의 본문 자식과 받기로 한 페이지를 비우고 이번 변경을 적는다. */
   beginDetection(changes) {
     this._bodyChildren.clear();
@@ -22155,6 +22369,7 @@ var RemoteDetector = class _RemoteDetector {
     const changes = [];
     this._childParentIds.clear();
     this._pages.clear();
+    this._moved.clear();
     const lastPull = this.stateDb.getMeta(LAST_PULL_META_KEY);
     const syncedRecords = this.stateDb.getAll();
     const trackedPageIds = new Set(
@@ -22212,7 +22427,10 @@ var RemoteDetector = class _RemoteDetector {
       for (const page of underRoot) {
         throwIfAborted(signal);
         const parentId = await extractParentId(this.notionClient, page);
-        if (parentId) this._childParentIds.add(normalizeNotionId(parentId));
+        if (parentId) {
+          this._childParentIds.add(normalizeNotionId(parentId));
+          this.noteParent(page.id, parentId);
+        }
       }
       for (const page of underRoot) {
         titles.set(normalizeNotionId(page.id), this.notionClient.extractTitle(page));
@@ -22297,6 +22515,7 @@ var RemoteDetector = class _RemoteDetector {
     const databaseIds = /* @__PURE__ */ new Set();
     this._childParentIds.clear();
     this._pages.clear();
+    this._moved.clear();
     const searchSince = incrementalSearchSince(since);
     const recentPages = await this.notionClient.searchRecentPages(searchSince, options.signal);
     const untracked = [];
@@ -22319,6 +22538,7 @@ var RemoteDetector = class _RemoteDetector {
         }
         continue;
       }
+      if (page.parent.type === "page_id") this.noteParent(page.id, page.parent.page_id);
       const modified = this.observation.modification(record, page);
       const rowDatabase = page.parentDatabaseId ?? (record.fileType === "db-row" ? record.notionParentId : null);
       if (modified && rowDatabase) databaseIds.add(compactNotionId(rowDatabase));
@@ -22888,6 +23108,12 @@ var SyncOrchestrator = class {
     );
     this.placement.useDatabaseCreator(this.databaseCreator);
     this.planner = new LocalPlanner(config, stateDb, vaultFs, changeDetector, this.placement);
+    this.remoteMoves = new RemoteMoveFollower(
+      config,
+      stateDb,
+      vaultFs,
+      () => this.placement.folderLookup()
+    );
     this.puller = new PagePuller(
       config,
       stateDb,
@@ -22955,6 +23181,7 @@ var SyncOrchestrator = class {
   databaseCreator;
   // 이번 실행의 로컬 변경 — 옮긴 노트 · 폴더를 짝짓고 상태 DB 에 옮겨 적는다(S-11).
   planner;
+  remoteMoves;
   // 원격에서 바뀐 것 — 전체 대조 · 증분 감지(ADR-027).
   detector;
   // 지난번에 본 뒤로 원격이 바뀌었나(N-05) — 덮어쓰기 · 지우기 전에, 변경을 보이기 전에 본다.
@@ -23299,6 +23526,17 @@ var SyncOrchestrator = class {
   async pull(options) {
     return this.gate.run("pull", () => this.executePull(options));
   }
+  /** 감지가 본, Notion 에서 옮긴 페이지를 볼트에서 옮긴다 — 경로를 좁힌 pull 은 그 범위의 것만. */
+  async followRemoteMoves(options) {
+    const moved = new Map(
+      [...this.detector.movedPages].filter(([pageId]) => {
+        const record = this.stateDb.getByNotionId(pageId);
+        return !!record && (!options?.paths || inAnyPathScope(record.obsidianPath, options.paths));
+      })
+    );
+    if (moved.size === 0) return { moved: [], skipped: [] };
+    return await this.remoteMoves.follow(moved, { dryRun: options?.dryRun });
+  }
   async executePull(options) {
     const startTime = Date.now();
     this.assertConnectionScope();
@@ -23358,6 +23596,7 @@ var SyncOrchestrator = class {
     }
     const remoteChanges = detection.changes;
     detected = remoteChanges;
+    const remoteMoves = await this.followRemoteMoves(options);
     const pendingDatabases = parsePendingDatabases(
       this.stateDb.getMeta(PENDING_DATABASES_META_KEY)
     );
@@ -23407,7 +23646,9 @@ var SyncOrchestrator = class {
             this.config.sync.deleteSync
           ),
           skippedDatabases: ledger.skipped
-        }
+        },
+        moved: remoteMoves.moved,
+        moveSkipped: remoteMoves.skipped
       };
     };
     const excludes = (path) => this.vaultFs.excludesPath?.(path) ?? false;
@@ -23438,7 +23679,7 @@ var SyncOrchestrator = class {
     }) : [];
     const workItems = [...filtered, ...restoreChanges, ...rerenderChanges];
     if (options?.dryRun) {
-      return this.pullPlanner.planPull(
+      const plan = await this.pullPlanner.planPull(
         filtered,
         restoreChanges,
         restoreIds,
@@ -23448,6 +23689,7 @@ var SyncOrchestrator = class {
         scan,
         ledger
       );
+      return { ...plan, moved: remoteMoves.moved, moveSkipped: remoteMoves.skipped };
     }
     let pullTotal = workItems.length;
     let pullCompleted = 0;