im-nobsidian 0.3.2 → 0.4.1

package/dist/index.js

@@ -2,11 +2,16 @@
 
 // src/index.ts
 import { createRequire } from "module";
-import { Command as Command11 } from "commander";
+import { Command as Command12 } from "commander";
 
 // src/commands/init.ts
 import { Command } from "commander";
-import { ConfigManager, NotionClient } from "@im-nobsidian/core";
+import {
+  ConfigManager,
+  NOTION_TOKEN_PREFIX,
+  NotionClient,
+  notionIdFromInput
+} from "@im-nobsidian/core";
 import { input, confirm } from "@inquirer/prompts";
 import ora from "ora";
 import chalk2 from "chalk";
@@ -17,6 +22,7 @@ var icons = {
   create: chalk.green("+"),
   update: chalk.yellow("~"),
   delete: chalk.red("-"),
+  move: chalk.cyan("\u2192"),
   success: chalk.green("\u2713"),
   fail: chalk.red("\u2715"),
   conflict: chalk.magenta("!"),
@@ -42,12 +48,15 @@ function operationLabel(op) {
       return chalk.yellow("updated");
     case "delete":
       return chalk.red("deleted");
+    case "move":
+      return chalk.cyan("moved");
   }
 }
-function summary(created, updated, deleted) {
+function summary(created, updated, deleted, moved = 0) {
   const parts = [];
   if (created > 0) parts.push(chalk.green(`${created} created`));
   if (updated > 0) parts.push(chalk.yellow(`${updated} updated`));
+  if (moved > 0) parts.push(chalk.cyan(`${moved} moved`));
   if (deleted > 0) parts.push(chalk.red(`${deleted} deleted`));
   if (parts.length === 0) parts.push(chalk.dim("no changes"));
   return parts.join("  ");
@@ -61,18 +70,50 @@ function failedCountText(count) {
 function duration(ms) {
   return chalk.dim(`Done in ${(ms / 1e3).toFixed(1)}s`);
 }
+function localDateTime(iso) {
+  const date = new Date(iso);
+  if (Number.isNaN(date.getTime())) return iso;
+  const pad = (n) => String(n).padStart(2, "0");
+  return `${date.getFullYear()}-${pad(date.getMonth() + 1)}-${pad(date.getDate())} ${pad(date.getHours())}:${pad(date.getMinutes())}:${pad(date.getSeconds())}`;
+}
+var FULL_SCAN_REASON = {
+  first: "first pull",
+  forced: "--force",
+  "database-mode": "database mode",
+  "every-pull": "every pull",
+  due: "scheduled"
+};
+function remoteScanLines(scan) {
+  if (scan.kind === "full") {
+    return [dimText(scan.reason ? `Full scan (${FULL_SCAN_REASON[scan.reason]})` : "Full scan")];
+  }
+  const skipped = scan.skippedDatabases ?? 0;
+  const skippedText = skipped > 0 ? ` \xB7 ${skipped} unchanged ${skipped === 1 ? "database" : "databases"} skipped` : "";
+  const lines = [dimText(`Changes-only scan${skippedText}`)];
+  if (scan.deletionsDeferred) lines.push(remoteDeletionHint(scan));
+  return lines;
+}
+function remoteDeletionHint(scan) {
+  const when = scan.nextFullAt ? `the next full scan (${localDateTime(scan.nextFullAt)})` : "the next pull (full scan due)";
+  return `${dimText(`Deletions in Notion apply at ${when} \u2014 or run`)} ${chalk.cyan("nobsi pull --force")}`;
+}
+function lastFullScanText(lastFullScanAt) {
+  return lastFullScanAt ? localDateTime(lastFullScanAt) : chalk.yellow("never");
+}
 function progress(current, total) {
   return chalk.dim(`[${current}/${total}]`);
 }
 function dimText(text) {
   return chalk.dim(text);
 }
-function failedItem(path, error) {
-  console.log(`  ${icons.fail} ${path}: ${chalk.red(error)}`);
+function failedItem(path, error, direction) {
+  const where = `${direction ? `${direction} ` : ""}${path || "/"}`;
+  console.log(`  ${icons.fail} ${where}: ${chalk.red(error)}`);
 }
 
 // src/commands/init.ts
-var initCommand = new Command("init").description("Im-Nobsidian \uCD08\uAE30 \uC124\uC815").option("--token <token>", "Notion Integration Token").option("--root-page-id <id>", "\uB8E8\uD2B8 \uD398\uC774\uC9C0 ID").option("--non-interactive", "\uBE44\uB300\uD654\uD615 \uBAA8\uB4DC").action(async (options) => {
+var ROOT_PAGE_UNREADABLE = "\uB8E8\uD2B8 \uD398\uC774\uC9C0\uC5D0\uC11C Notion \uD398\uC774\uC9C0 ID(32\uC790\uB9AC)\uB97C \uCC3E\uC9C0 \uBABB\uD588\uC2B5\uB2C8\uB2E4 \u2014 \uD398\uC774\uC9C0 \uC8FC\uC18C\uB098 ID \uB97C \uB123\uC73C\uC138\uC694.";
+var initCommand = new Command("init").description("Im-Nobsidian \uCD08\uAE30 \uC124\uC815").option("--token <token>", "Notion Integration Token").option("--root-page-id <id>", "\uB8E8\uD2B8 \uD398\uC774\uC9C0 ID \uB610\uB294 \uD398\uC774\uC9C0 \uC8FC\uC18C").option("--non-interactive", "\uBE44\uB300\uD654\uD615 \uBAA8\uB4DC").action(async (options) => {
   const cwd = process.cwd();
   const configManager = new ConfigManager(cwd);
   console.log(`
@@ -84,8 +125,14 @@ ${header(chalk2.cyan("  Im-Nobsidian Setup"))}`);
       process.exitCode = 1;
       return;
     }
-    if (!options.token.startsWith("ntn_")) {
-      console.error("\uD1A0\uD070\uC740 ntn_\uC73C\uB85C \uC2DC\uC791\uD574\uC57C \uD569\uB2C8\uB2E4.");
+    if (!options.token.startsWith(NOTION_TOKEN_PREFIX)) {
+      console.error(`\uD1A0\uD070\uC740 ${NOTION_TOKEN_PREFIX}\uC73C\uB85C \uC2DC\uC791\uD574\uC57C \uD569\uB2C8\uB2E4.`);
+      process.exitCode = 1;
+      return;
+    }
+    const rootPageId = notionIdFromInput(options.rootPageId);
+    if (rootPageId === null) {
+      console.error(ROOT_PAGE_UNREADABLE);
       process.exitCode = 1;
       return;
     }
@@ -95,10 +142,9 @@ ${header(chalk2.cyan("  Im-Nobsidian Setup"))}`);
       await client.search({ pageSize: 1, filter: { property: "object", value: "page" } });
       spinner2.stop();
       console.log(`  ${icons.success} Token validated`);
-      await configManager.init({ token: options.token, rootPageId: options.rootPageId });
+      await configManager.init({ token: options.token, rootPageId });
       console.log(`
   ${icons.success} Config saved to ${dimText(configManager.configPath)}`);
-      console.log(`  ${icons.success} State DB initialized`);
       console.log(
         `
   ${header(chalk2.green("Ready!"))} Run ${chalk2.cyan("nobsi sync")} to start syncing.`
@@ -120,7 +166,7 @@ ${header(chalk2.cyan("  Im-Nobsidian Setup"))}`);
   }
   const token = await input({
     message: "Notion Integration Token:",
-    validate: (v) => v.startsWith("ntn_") || "ntn_\uC73C\uB85C \uC2DC\uC791\uD558\uB294 \uD1A0\uD070\uC744 \uC785\uB825\uD558\uC138\uC694"
+    validate: (v) => v.startsWith(NOTION_TOKEN_PREFIX) || `${NOTION_TOKEN_PREFIX}\uC73C\uB85C \uC2DC\uC791\uD558\uB294 \uD1A0\uD070\uC744 \uC785\uB825\uD558\uC138\uC694`
   });
   const spinner = ora("Notion \uC5F0\uACB0 \uD655\uC778 \uC911...").start();
   try {
@@ -144,14 +190,15 @@ ${header(chalk2.cyan("  Im-Nobsidian Setup"))}`);
       const title = extractPageTitle(page);
       console.log(`    ${dimText(`${i + 1}.`)} ${title}`);
     }
-    const rootPageId = await input({
-      message: "\uB8E8\uD2B8 \uD398\uC774\uC9C0 ID (\uC704\uC5D0\uC11C \uC120\uD0DD\uD558\uAC70\uB098 \uC9C1\uC811 \uC785\uB825):",
-      default: result.results[0]?.id
+    const rootPageInput = await input({
+      message: "\uB8E8\uD2B8 \uD398\uC774\uC9C0 ID \uB610\uB294 \uC8FC\uC18C (\uC704\uC5D0\uC11C \uC120\uD0DD\uD558\uAC70\uB098 \uC9C1\uC811 \uC785\uB825):",
+      default: result.results[0]?.id,
+      validate: (value) => notionIdFromInput(value) !== null || ROOT_PAGE_UNREADABLE
     });
+    const rootPageId = notionIdFromInput(rootPageInput);
     await configManager.init({ token, rootPageId });
     console.log(`
   ${icons.success} Config saved to ${dimText(configManager.configPath)}`);
-    console.log(`  ${icons.success} State DB initialized`);
     console.log(
       `
   ${header(chalk2.green("Ready!"))} Run ${chalk2.cyan("nobsi sync")} to start syncing.`
@@ -183,7 +230,51 @@ import {
   SyncOrchestrator,
   NodeVaultFS
 } from "@im-nobsidian/core";
-var pushCommand = new Command2("push").description("\uB85C\uCEEC \uBCC0\uACBD\uC0AC\uD56D\uC744 Notion\uC5D0 \uBC18\uC601").option("--dry-run", "\uC2E4\uC81C \uBC18\uC601 \uC5C6\uC774 \uBCC0\uACBD\uC0AC\uD56D\uB9CC \uD45C\uC2DC").option("-p, --path <paths...>", "\uD2B9\uC815 \uACBD\uB85C\uB9CC push").action(async (options) => {
+
+// src/utils/json-output.ts
+import { setLogger } from "@im-nobsidian/core";
+function enableJsonMode() {
+  const toStderr = (message, ...args) => console.error(message, ...args);
+  setLogger({ warn: toStderr, error: toStderr, info: toStderr, debug: () => {
+  } });
+}
+function pushJson(result) {
+  return {
+    created: result.created,
+    updated: result.updated,
+    deleted: result.deleted,
+    moved: result.moved,
+    churn: result.created + result.updated + result.deleted + result.moved,
+    failed: result.failed,
+    durationMs: result.duration
+  };
+}
+function pullJson(result) {
+  return {
+    created: result.created,
+    updated: result.updated,
+    deleted: result.deleted,
+    restored: result.restored,
+    churn: result.created + result.updated + result.deleted + result.restored,
+    conflicts: result.conflicts.length,
+    failed: result.failed,
+    writtenPaths: result.writtenPaths.length,
+    images: result.imageCount,
+    files: result.fileCount,
+    links: result.linkCount,
+    durationMs: result.duration,
+    remoteScan: result.remoteScan ?? null
+  };
+}
+function printJson(value) {
+  process.stdout.write(`${JSON.stringify(value)}
+`);
+}
+
+// src/commands/push.ts
+var pushCommand = new Command2("push").description("\uB85C\uCEEC \uBCC0\uACBD\uC0AC\uD56D\uC744 Notion\uC5D0 \uBC18\uC601").option("--dry-run", "\uC2E4\uC81C \uBC18\uC601 \uC5C6\uC774 \uBCC0\uACBD\uC0AC\uD56D\uB9CC \uD45C\uC2DC").option("-p, --path <paths...>", "\uD2B9\uC815 \uACBD\uB85C\uB9CC push").option("--json", "\uACB0\uACFC\uB97C JSON \uD55C \uC904\uB85C \uCD9C\uB825 (\uC790\uB3D9\uD654\uC6A9 \u2014 \uB85C\uADF8\uB294 stderr)").action(async (options) => {
+  const json = options.json === true;
+  if (json) enableJsonMode();
   const cwd = process.cwd();
   const configManager = new ConfigManager2(cwd);
   const config = await configManager.load();
@@ -192,25 +283,32 @@ var pushCommand = new Command2("push").description("\uB85C\uCEEC \uBCC0\uACBD\uC
     const client = NotionClient2.fromConfig(config);
     const vaultFs = new NodeVaultFS(cwd, config.paths);
     const orchestrator = new SyncOrchestrator(config, stateDb, client, vaultFs);
-    console.log(`
+    if (!json) {
+      console.log(`
 ${header("  Pushing to Notion...")}`);
-    if (options.dryRun) console.log(dimText("  (dry-run mode)"));
-    console.log("");
+      if (options.dryRun) console.log(dimText("  (dry-run mode)"));
+      console.log("");
+    }
     const result = await orchestrator.push({
       dryRun: options.dryRun,
       paths: options.path,
-      onProgress: (current, total, item) => {
+      onProgress: json ? void 0 : (current, total, item) => {
         const icon = operationIcon(item.operation);
         const label = operationLabel(item.operation);
         const prog = progress(current, total);
         console.log(`  ${icon} ${item.path} ${prog} ${label}`);
       }
     });
+    if (json) {
+      printJson(pushJson(result));
+      if (result.failed.length > 0) process.exitCode = 1;
+      return;
+    }
     const failedCount = result.failed.length;
     console.log(`
   ${completionHeader("Push", failedCount)}`);
     console.log(
-      `  ${summary(result.created, result.updated, result.deleted)}  ${failedCountText(failedCount)}`
+      `  ${summary(result.created, result.updated, result.deleted, result.moved)}  ${failedCountText(failedCount)}`
     );
     console.log(`  ${duration(result.duration)}`);
     if (failedCount > 0) {
@@ -226,7 +324,7 @@ ${header("  Pushing to Notion...")}`);
 });
 
 // src/commands/pull.ts
-import { Command as Command3 } from "commander";
+import { Command as Command3, Option } from "commander";
 import {
   ConfigManager as ConfigManager3,
   StateDB as StateDB2,
@@ -238,7 +336,14 @@ import chalk3 from "chalk";
 var pullCommand = new Command3("pull").description("Notion \uBCC0\uACBD\uC0AC\uD56D\uC744 \uB85C\uCEEC\uC5D0 \uBC18\uC601").option("--dry-run", "\uC2E4\uC81C \uBC18\uC601 \uC5C6\uC774 \uBCC0\uACBD\uC0AC\uD56D\uB9CC \uD45C\uC2DC").option("-p, --path <paths...>", "\uD2B9\uC815 \uACBD\uB85C\uB9CC pull").option(
   "--force",
   "\uC99D\uBD84 \uAC10\uC9C0\uB97C \uAC74\uB108\uB6F0\uACE0 \uC804\uCCB4 \uC2A4\uCE94 (search \uC778\uB371\uC2F1 \uC9C0\uC5F0\uC73C\uB85C \uB204\uB77D\uB41C \uC2E0\uADDC \uD398\uC774\uC9C0\xB7DB \uBCF5\uAD6C)"
-).action(async (options) => {
+).addOption(
+  new Option(
+    "--rerender",
+    "Notion \uC5D0\uC11C \uBC14\uB00C\uC9C0 \uC54A\uC740 \uBC1B\uC544 \uB454 \uB178\uD2B8\uB3C4 \uC9C0\uAE08 \uBCC0\uD658\uAE30\uB85C \uB2E4\uC2DC \uADF8\uB9BC (\uBCFC\uD2B8\uC5D0\uC11C \uACE0\uCE5C \uB178\uD2B8\uB294 \uADF8\uB300\uB85C)"
+  ).conflicts("dryRun")
+).option("--json", "\uACB0\uACFC\uB97C JSON \uD55C \uC904\uB85C \uCD9C\uB825 (\uC790\uB3D9\uD654\uC6A9 \u2014 \uB85C\uADF8\uB294 stderr)").action(async (options) => {
+  const json = options.json === true;
+  if (json) enableJsonMode();
   const cwd = process.cwd();
   const configManager = new ConfigManager3(cwd);
   const config = await configManager.load();
@@ -247,29 +352,40 @@ var pullCommand = new Command3("pull").description("Notion \uBCC0\uACBD\uC0AC\uD
     const client = NotionClient3.fromConfig(config);
     const vaultFs = new NodeVaultFS2(cwd, config.paths);
     const orchestrator = new SyncOrchestrator2(config, stateDb, client, vaultFs);
-    console.log(`
+    if (!json) {
+      console.log(`
 ${header("  Pulling from Notion...")}`);
-    if (options.dryRun) console.log(dimText("  (dry-run mode)"));
-    console.log("");
+      if (options.dryRun) console.log(dimText("  (dry-run mode)"));
+      console.log("");
+    }
     const result = await orchestrator.pull({
       dryRun: options.dryRun,
       paths: options.path,
       force: options.force,
-      onProgress: (current, total, item) => {
+      rerender: options.rerender,
+      onProgress: json ? void 0 : (current, total, item) => {
+        if (item.unchanged) return;
         const icon = operationIcon(item.operation);
         const label = operationLabel(item.operation);
         const prog = progress(current, total);
         console.log(`  ${icon} ${item.path} ${prog} ${label}`);
       }
     });
+    if (json) {
+      printJson(pullJson(result));
+      if (result.failed.length > 0) process.exitCode = 1;
+      return;
+    }
     if (result.imageCount > 0) {
       console.log(
         `
-  ${icons.success} ${result.imageCount} images \u2192 ${dimText("attachments/")}`
+  ${icons.success} ${result.imageCount} images \u2192 ${dimText(`${config.paths.attachments}/`)}`
       );
     }
     if (result.fileCount > 0) {
-      console.log(`  ${icons.success} ${result.fileCount} files \u2192 ${dimText("attachments/")}`);
+      console.log(
+        `  ${icons.success} ${result.fileCount} files \u2192 ${dimText(`${config.paths.attachments}/`)}`
+      );
     }
     if (result.linkCount > 0) {
       console.log(`  ${icons.success} ${result.linkCount} links resolved`);
@@ -284,6 +400,9 @@ ${header("  Pulling from Notion...")}`);
       console.log(`  ${icons.success} ${chalk3.yellow(`${result.restored} restored`)}`);
     }
     console.log(`  ${duration(result.duration)}`);
+    if (result.remoteScan) {
+      for (const line of remoteScanLines(result.remoteScan)) console.log(`  ${line}`);
+    }
     if (result.conflicts.length > 0) {
       console.log(
         `
@@ -312,7 +431,11 @@ import {
   NodeVaultFS as NodeVaultFS3
 } from "@im-nobsidian/core";
 import chalk4 from "chalk";
-var syncCommand = new Command4("sync").description("\uC591\uBC29\uD5A5 \uB3D9\uAE30\uD654 (Pull \u2192 Push)").option("--dry-run", "\uC2E4\uC81C \uBC18\uC601 \uC5C6\uC774 \uBCC0\uACBD\uC0AC\uD56D\uB9CC \uD45C\uC2DC").action(async (options) => {
+var syncCommand = new Command4("sync").description("\uC591\uBC29\uD5A5 \uB3D9\uAE30\uD654 (Pull \u2192 Push)").option("--dry-run", "\uC2E4\uC81C \uBC18\uC601 \uC5C6\uC774 \uBCC0\uACBD\uC0AC\uD56D\uB9CC \uD45C\uC2DC").option("--json", "\uACB0\uACFC\uB97C JSON \uD55C \uC904\uB85C \uCD9C\uB825 (\uC790\uB3D9\uD654\uC6A9 \u2014 \uB85C\uADF8\uB294 stderr)").action(async (options) => {
+  const json = options.json === true;
+  if (json) enableJsonMode();
+  const log = json ? () => {
+  } : (line) => console.log(line);
   const cwd = process.cwd();
   const configManager = new ConfigManager4(cwd);
   const config = await configManager.load();
@@ -321,37 +444,44 @@ var syncCommand = new Command4("sync").description("\uC591\uBC29\uD5A5 \uB3D9\uA
     const client = NotionClient4.fromConfig(config);
     const vaultFs = new NodeVaultFS3(cwd, config.paths);
     const orchestrator = new SyncOrchestrator3(config, stateDb, client, vaultFs);
-    console.log(`
+    log(`
 ${header("  Bidirectional Sync")}`);
-    console.log(`  ${separator()}`);
-    if (options.dryRun) console.log(dimText("  (dry-run mode)"));
-    console.log(`
+    log(`  ${separator()}`);
+    if (options.dryRun) log(dimText("  (dry-run mode)"));
+    log(`
   ${header(chalk4.blue("\u25BC Pull"))} ${dimText("(Notion \u2192 Obsidian)")}`);
-    const pullResult = await orchestrator.pull({
-      dryRun: options.dryRun,
-      onProgress: (_current, _total, item) => {
-        const icon = operationIcon(item.operation);
-        const label = operationLabel(item.operation);
-        console.log(`    ${icon} ${item.path} ${label}`);
-      }
-    });
-    if (pullResult.imageCount > 0) {
-      console.log(`    ${icons.success} ${pullResult.imageCount} images downloaded`);
-    }
-    if (pullResult.linkCount > 0) {
-      console.log(`    ${icons.success} ${pullResult.linkCount} links resolved`);
-    }
-    console.log(`
+    let pushShown = false;
+    const showPush = () => {
+      if (pushShown) return;
+      pushShown = true;
+      log(`
   ${header(chalk4.magenta("\u25B2 Push"))} ${dimText("(Obsidian \u2192 Notion)")}`);
-    const pushResult = await orchestrator.push({
+    };
+    const result = await orchestrator.sync({
       dryRun: options.dryRun,
       onProgress: (_current, _total, item) => {
+        if (item.direction === "push") showPush();
+        if (item.unchanged) return;
         const icon = operationIcon(item.operation);
         const label = operationLabel(item.operation);
-        console.log(`    ${icon} ${item.path} ${label}`);
+        log(`    ${icon} ${item.path} ${label}`);
       }
     });
-    const totalDuration = pullResult.duration + pushResult.duration;
+    showPush();
+    const { pull: pullResult, push: pushResult } = result;
+    if (json) {
+      const pull = pullJson(pullResult);
+      const push = pushJson(pushResult);
+      printJson({
+        pull,
+        push,
+        churn: pull.churn + push.churn,
+        conflicts: pull.conflicts,
+        durationMs: result.duration
+      });
+      if (pullResult.failed.length + pushResult.failed.length > 0) process.exitCode = 1;
+      return;
+    }
     const pullFailed = pullResult.failed.length;
     const pushFailed = pushResult.failed.length;
     console.log(`
@@ -360,20 +490,29 @@ ${header("  Bidirectional Sync")}`);
       `  ${chalk4.blue("Pull:")} ${summary(pullResult.created, pullResult.updated, pullResult.deleted)}` + // 사라졌던 파일이 되살아난 경우에만 덧붙인다 — 평상시 요약을 어지럽히지 않는다.
       (pullResult.restored > 0 ? `  ${chalk4.yellow(`${pullResult.restored} restored`)}` : "") + (pullFailed > 0 ? `  ${chalk4.red(`${pullFailed} failed`)}` : "")
     );
+    if (pullResult.imageCount > 0) {
+      console.log(`    ${icons.success} ${pullResult.imageCount} images downloaded`);
+    }
+    if (pullResult.linkCount > 0) {
+      console.log(`    ${icons.success} ${pullResult.linkCount} links resolved`);
+    }
     console.log(
-      `  ${chalk4.magenta("Push:")} ${summary(pushResult.created, pushResult.updated, pushResult.deleted)}` + (pushFailed > 0 ? `  ${chalk4.red(`${pushFailed} failed`)}` : "")
+      `  ${chalk4.magenta("Push:")} ${summary(pushResult.created, pushResult.updated, pushResult.deleted, pushResult.moved)}` + (pushFailed > 0 ? `  ${chalk4.red(`${pushFailed} failed`)}` : "")
     );
-    console.log(`  ${duration(totalDuration)}`);
-    if (pullResult.conflicts.length > 0) {
+    console.log(`  ${duration(result.duration)}`);
+    if (pullResult.remoteScan) {
+      for (const line of remoteScanLines(pullResult.remoteScan)) console.log(`  ${line}`);
+    }
+    if (result.conflicts.length > 0) {
       console.log(
         `
-  ${icons.conflict} ${chalk4.magenta(`${pullResult.conflicts.length} conflicts`)} \u2014 run ${chalk4.cyan("nobsi resolve")}`
+  ${icons.conflict} ${chalk4.magenta(`${result.conflicts.length} conflicts`)} \u2014 run ${chalk4.cyan("nobsi resolve")}`
       );
     }
     if (pullFailed + pushFailed > 0) {
       console.log("");
-      for (const f of pullResult.failed) failedItem(`\u25BC ${f.path}`, f.error);
-      for (const f of pushResult.failed) failedItem(`\u25B2 ${f.path}`, f.error);
+      for (const f of pullResult.failed) failedItem(f.path, f.error, "\u25BC");
+      for (const f of pushResult.failed) failedItem(f.path, f.error, "\u25B2");
       process.exitCode = 1;
     }
   } finally {
@@ -388,7 +527,8 @@ import {
   StateDB as StateDB4,
   NotionClient as NotionClient5,
   SyncOrchestrator as SyncOrchestrator4,
-  NodeVaultFS as NodeVaultFS4
+  NodeVaultFS as NodeVaultFS4,
+  isRemoteDeletion
 } from "@im-nobsidian/core";
 import chalk5 from "chalk";
 var statusCommand = new Command5("status").description("\uB3D9\uAE30\uD654 \uC0C1\uD0DC \uD655\uC778 (--full: \uC6D0\uACA9 \uBCC0\uACBD \uD3EC\uD568)").option("--full", "Notion \uC6D0\uACA9 \uBCC0\uACBD\uAE4C\uC9C0 \uC591\uBC29\uD5A5 \uD655\uC778 (API \uD638\uCD9C, \uB290\uB9BC)").action(async (opts) => {
@@ -409,21 +549,22 @@ ${header("  Sync Status")}`);
     console.log(`  ${dimText("Root page:")}  ${rootId.slice(0, 8)}...`);
     console.log(`  ${dimText("Direction:")}  ${direction}`);
     if (status.lastSyncAt) {
-      const date = new Date(status.lastSyncAt);
-      const iso = date.getFullYear() + "-" + String(date.getMonth() + 1).padStart(2, "0") + "-" + String(date.getDate()).padStart(2, "0") + " " + String(date.getHours()).padStart(2, "0") + ":" + String(date.getMinutes()).padStart(2, "0") + ":" + String(date.getSeconds()).padStart(2, "0");
-      console.log(`  ${dimText("Last sync:")}  ${iso}`);
+      console.log(`  ${dimText("Last sync:")}  ${localDateTime(status.lastSyncAt)}`);
     } else {
       console.log(`  ${dimText("Last sync:")}  ${chalk5.yellow("never")}`);
     }
+    console.log(`  ${dimText("Full scan:")}  ${lastFullScanText(status.lastFullScanAt)}`);
     const allRecords = stateDb.getAll();
     const total = allRecords.length;
     const conflictCount = status.conflictRecords.length;
     const createdChanges = status.localChanges.filter((c) => c.type === "created");
     const modifiedChanges = status.localChanges.filter((c) => c.type === "modified");
     const deletedChanges = status.localChanges.filter((c) => c.type === "deleted");
+    const movedChanges = status.localChanges.filter((c) => c.type === "moved");
     const dirtyPaths = /* @__PURE__ */ new Set([
       ...modifiedChanges.map((c) => c.path),
       ...deletedChanges.map((c) => c.path),
+      ...movedChanges.flatMap((c) => [c.path, c.movedFrom ?? c.path]),
       ...status.conflictRecords.map((r) => r.obsidianPath)
     ]);
     const synced = allRecords.filter(
@@ -432,12 +573,17 @@ ${header("  Sync Status")}`);
     const remoteCreated = status.remoteChanges.filter((c) => c.type === "created");
     const remoteModified = status.remoteChanges.filter((c) => c.type === "modified");
     const remoteDeleted = status.remoteChanges.filter((c) => c.type === "deleted");
+    const remoteMoved = status.remoteChanges.filter((c) => c.type === "moved");
+    const { folderMoves } = status;
     console.log(`
   ${header(`Tracked files: ${total}`)}`);
     console.log(`  ${icons.synced} ${chalk5.green("synced")}     ${synced}`);
     if (modifiedChanges.length > 0) {
       console.log(`  ${icons.modified} ${chalk5.yellow("modified")}   ${modifiedChanges.length}`);
     }
+    if (movedChanges.length > 0) {
+      console.log(`  ${icons.move} ${chalk5.cyan("moved")}      ${movedChanges.length}`);
+    }
     if (deletedChanges.length > 0) {
       console.log(`  ${chalk5.red("-")} ${chalk5.red("deleted")}    ${deletedChanges.length}`);
     }
@@ -461,6 +607,29 @@ ${header("  Sync Status")}`);
         console.log(dimText(`    ... and ${modifiedChanges.length - 10} more`));
       }
     }
+    if (folderMoves.length + movedChanges.length > 0) {
+      console.log(`
+  ${header("Moved:")}`);
+      for (const move of folderMoves) {
+        console.log(`    ${icons.move} ${move.from}/ \u2192 ${move.to}/ ${dimText("(folder)")}`);
+      }
+      for (const c of movedChanges.slice(0, 10)) {
+        console.log(`    ${icons.move} ${c.movedFrom ?? "?"} \u2192 ${c.path}`);
+      }
+      if (movedChanges.length > 10) {
+        console.log(dimText(`    ... and ${movedChanges.length - 10} more`));
+      }
+    }
+    if (deletedChanges.length > 0) {
+      console.log(`
+  ${header("Deleted files:")}`);
+      for (const c of deletedChanges.slice(0, 10)) {
+        console.log(`    ${chalk5.red("-")} ${c.path}`);
+      }
+      if (deletedChanges.length > 10) {
+        console.log(dimText(`    ... and ${deletedChanges.length - 10} more`));
+      }
+    }
     if (createdChanges.length > 0) {
       console.log(`
   ${header("New files:")}`);
@@ -482,12 +651,18 @@ ${header("  Sync Status")}`);
           `    ${chalk5.yellow("~")} ${chalk5.yellow("modified")}   ${remoteModified.length}`
         );
       }
+      if (remoteMoved.length > 0) {
+        console.log(`    ${icons.move} ${chalk5.cyan("moved")}      ${remoteMoved.length}`);
+      }
       if (remoteDeleted.length > 0) {
         console.log(`    ${chalk5.red("-")} ${chalk5.red("deleted")}    ${remoteDeleted.length}`);
       }
       for (const c of status.remoteChanges.slice(0, 10)) {
-        const icon = c.type === "created" ? chalk5.cyan("+") : c.type === "modified" ? chalk5.yellow("~") : chalk5.red("-");
-        console.log(`    ${icon} ${c.pageId.slice(0, 8)}... ${dimText(`(${c.type})`)}`);
+        const icon = c.type === "created" ? chalk5.cyan("+") : c.type === "modified" ? chalk5.yellow("~") : c.type === "moved" ? icons.move : chalk5.red("-");
+        const name = c.path ?? (c.title ? `${c.title} ${dimText("(new page)")}` : void 0);
+        console.log(
+          `    ${icon} ${name ?? `${c.pageId.slice(0, 8)}...`} ${dimText(`(${c.type})`)}`
+        );
       }
       if (status.remoteChanges.length > 10) {
         console.log(dimText(`    ... and ${status.remoteChanges.length - 10} more`));
@@ -496,13 +671,15 @@ ${header("  Sync Status")}`);
     if (conflictCount > 0) {
       console.log(`
   ${header(chalk5.magenta("Conflicts:"))}`);
+      const remoteDeleted2 = new Set(
+        status.conflicts.filter(isRemoteDeletion).map((c) => c.syncRecord.obsidianPath)
+      );
       for (const r of status.conflictRecords) {
-        console.log(
-          `    ${icons.conflict} ${r.obsidianPath.padEnd(30)} ${dimText("(both sides changed)")}`
-        );
+        const reason = remoteDeleted2.has(r.obsidianPath) ? "(deleted in Notion, local edits not pushed)" : "(both sides changed)";
+        console.log(`    ${icons.conflict} ${r.obsidianPath.padEnd(30)} ${dimText(reason)}`);
       }
     }
-    const hasChanges = status.localChanges.length > 0 || status.remoteChanges.length > 0 || conflictCount > 0;
+    const hasChanges = status.localChanges.length > 0 || folderMoves.length > 0 || status.remoteChanges.length > 0 || conflictCount > 0;
     if (hasChanges) {
       console.log("");
       if (conflictCount > 0) {
@@ -513,6 +690,11 @@ ${header("  Sync Status")}`);
       console.log(
         `  ${dimText("Run")} ${chalk5.cyan("nobsi sync")} ${dimText("to push/pull changes")}`
       );
+      if (modifiedChanges.length + deletedChanges.length > 0) {
+        console.log(
+          `  ${dimText("Run")} ${chalk5.cyan("nobsi discard <path>")} ${dimText("to discard local edits")}`
+        );
+      }
     } else {
       console.log(`
   ${chalk5.green("Everything up to date")} \u2713`);
@@ -522,6 +704,9 @@ ${header("  Sync Status")}`);
         `
   ${dimText("Run")} ${chalk5.cyan("nobsi status --full")} ${dimText("to check Notion remote changes")}`
       );
+    } else if (status.remoteScan?.deletionsDeferred) {
+      console.log(`
+  ${remoteDeletionHint(status.remoteScan)}`);
     }
   } finally {
     stateDb.close();
@@ -536,9 +721,31 @@ import {
   NotionClient as NotionClient6,
   SyncOrchestrator as SyncOrchestrator5,
   NodeVaultFS as NodeVaultFS5,
+  formatUnifiedDiff,
+  lineDiff,
   matchesPathScope
 } from "@im-nobsidian/core";
-import { createTwoFilesPatch } from "diff";
+
+// src/utils/diff-output.ts
+import { DIFF_SIGN } from "@im-nobsidian/core";
+var BOLD = "\x1B[1m";
+var RED = "\x1B[31m";
+var GREEN = "\x1B[32m";
+var CYAN = "\x1B[36m";
+var RESET = "\x1B[0m";
+var LINE_COLOR = {
+  [DIFF_SIGN.added]: GREEN,
+  [DIFF_SIGN.removed]: RED,
+  "@": CYAN
+};
+function printUnifiedDiff(lines, color) {
+  lines.forEach((line, index) => {
+    const code = index < 2 ? BOLD : LINE_COLOR[line.charAt(0)];
+    console.log(color && code ? `${code}${line}${RESET}` : line);
+  });
+}
+
+// src/commands/diff.ts
 var diffCommand = new Command6("diff").description(
   "\uB85C\uCEEC \uBCC0\uACBD\uC0AC\uD56D \uD45C\uC2DC (\uAE30\uBCF8: \uB9C8\uC9C0\uB9C9 \uB3D9\uAE30\uD654 \uC2DC\uC810\uACFC \uBE44\uAD50, --remote: Notion \uD604\uC7AC\uBCF8\uACFC \uBE44\uAD50)"
 ).argument("[path]", "\uD2B9\uC815 \uD30C\uC77C \uACBD\uB85C (\uC0DD\uB7B5 \uC2DC \uBCC0\uACBD\uB41C \uBAA8\uB4E0 \uD30C\uC77C)").option("--color", "\uCEEC\uB7EC \uCD9C\uB825", true).option("--remote", "Notion \uD604\uC7AC \uBCF8\uBB38\uACFC \uBE44\uAD50 (API \uD638\uCD9C, \uB290\uB9BC)").action(async (targetPath, options) => {
@@ -556,10 +763,15 @@ var diffCommand = new Command6("diff").description(
       console.log("\uBCC0\uACBD\uC0AC\uD56D \uC5C6\uC74C");
       return;
     }
+    let failed = 0;
     for (const change of changes) {
-      const record = stateDb.getByPath(change.path);
       if (options.remote && change.type !== "deleted") {
-        const remote = await orchestrator.renderRemoteSnapshot(change.path);
+        let remotePath = change.path;
+        let remote = await orchestrator.renderRemoteSnapshot(remotePath);
+        if (remote === null && change.movedFrom) {
+          remotePath = change.movedFrom;
+          remote = await orchestrator.renderRemoteSnapshot(remotePath);
+        }
         if (remote === null) {
           console.log(`--- (\uC6D0\uACA9 \uC5C6\uC74C) ${change.path}`);
           console.log(`+++ b/${change.path}`);
@@ -568,76 +780,49 @@ var diffCommand = new Command6("diff").description(
           continue;
         }
         const currentContent = await vaultFs.readFile(change.path);
-        const patch = createTwoFilesPatch(
-          `notion/${change.path}`,
-          `b/${change.path}`,
-          remote,
-          currentContent
-        );
-        printPatch(patch, options.color, `notion/${change.path}`, `b/${change.path}`);
+        const hunks = lineDiff(remote, currentContent);
+        const lines = formatUnifiedDiff(hunks, `notion/${remotePath}`, `b/${change.path}`);
+        if (hunks.length === 0) lines.push("(Notion \uACFC \uB0B4\uC6A9\uC774 \uAC19\uC2B5\uB2C8\uB2E4)");
+        printUnifiedDiff(lines, options.color);
         console.log("");
         continue;
       }
-      if (change.type === "created") {
-        const content = await vaultFs.readFile(change.path);
-        const patch = createTwoFilesPatch("/dev/null", `b/${change.path}`, "", content);
-        printPatch(patch, options.color, "/dev/null", `b/${change.path}`);
-      } else if (change.type === "deleted") {
-        if (record?.baseSnapshot) {
-          const oldContent = record.baseSnapshot.toString("utf-8");
-          const patch = createTwoFilesPatch(`a/${change.path}`, "/dev/null", oldContent, "");
-          printPatch(patch, options.color, `a/${change.path}`, "/dev/null");
-        } else {
-          console.log(`--- a/${change.path}`);
-          console.log(`+++ /dev/null`);
-          console.log(`(\uC774\uC804 \uC2A4\uB0C5\uC0F7 \uC5C6\uC74C)`);
-        }
-      } else if (change.type === "modified" && record?.baseSnapshot) {
-        const currentContent = await vaultFs.readFile(change.path);
-        const baseContent = record.baseSnapshot.toString("utf-8");
-        const patch = createTwoFilesPatch(
-          `a/${change.path}`,
-          `b/${change.path}`,
-          baseContent,
-          currentContent
-        );
-        printPatch(patch, options.color, `a/${change.path}`, `b/${change.path}`);
+      let diff;
+      try {
+        diff = await orchestrator.localChangeDiff(change);
+      } catch (error) {
+        failed++;
+        console.log(`--- a/${change.path}`);
+        console.log(`(${error instanceof Error ? error.message : String(error)})`);
+        console.log("");
+        continue;
       }
+      printChangeDiff(diff, options.color);
       console.log("");
     }
+    if (failed > 0) process.exitCode = 1;
   } finally {
     stateDb.close();
   }
 });
-function printPatch(patch, color, oldPath, newPath) {
-  for (const line of patch.split("\n")) {
-    let output = line;
-    if (line.startsWith("===")) {
-      output = "===================================================================";
-    } else if (line.startsWith("--- ")) {
-      output = `--- ${oldPath}`;
-    } else if (line.startsWith("+++ ")) {
-      output = `+++ ${newPath}`;
-    }
-    if (!color) {
-      console.log(output);
-      continue;
-    }
-    if (output.startsWith("+++") || output.startsWith("---")) {
-      console.log(`\x1B[1m${output}\x1B[0m`);
-    } else if (output.startsWith("+")) {
-      console.log(`\x1B[32m${output}\x1B[0m`);
-    } else if (output.startsWith("-")) {
-      console.log(`\x1B[31m${output}\x1B[0m`);
-    } else if (output.startsWith("@@")) {
-      console.log(`\x1B[36m${output}\x1B[0m`);
-    } else {
-      console.log(output);
+function printChangeDiff(diff, color) {
+  const oldPath = diff.before === null ? "/dev/null" : `a/${diff.movedFrom ?? diff.path}`;
+  const newPath = diff.after === null ? "/dev/null" : `b/${diff.path}`;
+  if (diff.movedFrom) {
+    console.log(`rename from ${diff.movedFrom}`);
+    console.log(`rename to ${diff.path}`);
+    if (diff.before === diff.after) {
+      console.log("(\uB0B4\uC6A9\uC740 \uADF8\uB300\uB85C\uC785\uB2C8\uB2E4 \u2014 \uC790\uB9AC\uB9CC \uC62E\uACBC\uC2B5\uB2C8\uB2E4)");
+      return;
     }
   }
+  printUnifiedDiff(
+    formatUnifiedDiff(lineDiff(diff.before ?? "", diff.after ?? ""), oldPath, newPath),
+    color
+  );
 }
 
-// src/commands/fetch.ts
+// src/commands/discard.ts
 import { Command as Command7 } from "commander";
 import {
   ConfigManager as ConfigManager7,
@@ -646,8 +831,7 @@ import {
   SyncOrchestrator as SyncOrchestrator6,
   NodeVaultFS as NodeVaultFS6
 } from "@im-nobsidian/core";
-import chalk6 from "chalk";
-var fetchCommand = new Command7("fetch").description("Notion \uB9AC\uBAA8\uD2B8 \uC0C1\uD0DC \uC2A4\uCE94 (\uC0AD\uC81C \uAC10\uC9C0 \uD3EC\uD568)").action(async () => {
+var discardCommand = new Command7("discard").description("\uB85C\uCEEC \uBCC0\uACBD\uC744 \uC9C0\uB09C \uB3D9\uAE30\uD654 \uB54C\uC758 \uAE00\uB85C \uB418\uB3CC\uB9AC\uAE30 (Notion \uC740 \uADF8\uB300\uB85C)").argument("<paths...>", "\uB418\uB3CC\uB9B4 \uB178\uD2B8 \uACBD\uB85C \u2014 status \uAC00 \uBCF4\uC778 \uBCFC\uD2B8 \uAE30\uC900 \uACBD\uB85C").action(async (paths) => {
   const cwd = process.cwd();
   const configManager = new ConfigManager7(cwd);
   const config = await configManager.load();
@@ -656,6 +840,41 @@ var fetchCommand = new Command7("fetch").description("Notion \uB9AC\uBAA8\uD2B8
     const client = NotionClient7.fromConfig(config);
     const vaultFs = new NodeVaultFS6(cwd, config.paths);
     const orchestrator = new SyncOrchestrator6(config, stateDb, client, vaultFs);
+    let failed = 0;
+    for (const path of paths) {
+      try {
+        await orchestrator.discardLocalChange(path);
+        console.log(`  ${icons.success} ${path}`);
+      } catch (error) {
+        failed++;
+        failedItem(path, error instanceof Error ? error.message : String(error));
+      }
+    }
+    if (failed > 0) process.exitCode = 1;
+  } finally {
+    stateDb.close();
+  }
+});
+
+// src/commands/fetch.ts
+import { Command as Command8 } from "commander";
+import {
+  ConfigManager as ConfigManager8,
+  StateDB as StateDB7,
+  NotionClient as NotionClient8,
+  SyncOrchestrator as SyncOrchestrator7,
+  NodeVaultFS as NodeVaultFS7
+} from "@im-nobsidian/core";
+import chalk6 from "chalk";
+var fetchCommand = new Command8("fetch").description("Notion \uB9AC\uBAA8\uD2B8 \uC0C1\uD0DC \uC2A4\uCE94 (\uC0AD\uC81C \uAC10\uC9C0 \uD3EC\uD568)").action(async () => {
+  const cwd = process.cwd();
+  const configManager = new ConfigManager8(cwd);
+  const config = await configManager.load();
+  const stateDb = StateDB7.open(configManager.dbPath);
+  try {
+    const client = NotionClient8.fromConfig(config);
+    const vaultFs = new NodeVaultFS7(cwd, config.paths);
+    const orchestrator = new SyncOrchestrator7(config, stateDb, client, vaultFs);
     console.log(dimText("  Scanning remote pages..."));
     const result = await orchestrator.fetch();
     console.log(`
@@ -687,34 +906,68 @@ ${header("  Remote Scan")}`);
 });
 
 // src/commands/resolve.ts
-import { Command as Command8 } from "commander";
+import { Command as Command9 } from "commander";
 import { select, confirm as confirm2 } from "@inquirer/prompts";
 import {
-  ConfigManager as ConfigManager8,
-  StateDB as StateDB7,
-  NotionClient as NotionClient8,
-  SyncOrchestrator as SyncOrchestrator7,
-  NodeVaultFS as NodeVaultFS7
+  ConfigManager as ConfigManager9,
+  StateDB as StateDB8,
+  NotionClient as NotionClient9,
+  SyncOrchestrator as SyncOrchestrator8,
+  NodeVaultFS as NodeVaultFS8,
+  applicableChoices,
+  isRemoteDeletion as isRemoteDeletion2
 } from "@im-nobsidian/core";
+
+// src/utils/state-db-failure.ts
+import { StateDbUnavailableError } from "@im-nobsidian/core";
+function describeFailure(error) {
+  const message = error instanceof Error ? error.message : String(error);
+  if (!(error instanceof StateDbUnavailableError)) return message;
+  return `${message} \u2014 ${error.guidance("\uBA85\uB839\uC744 \uB2E4\uC2DC \uC2E4\uD589\uD558\uC138\uC694")}`;
+}
+function reportStateDbFailure(error, proc) {
+  if (!(error instanceof StateDbUnavailableError)) throw error;
+  console.error(`\uC624\uB958: ${describeFailure(error)}`);
+  proc.exitCode = 1;
+}
+
+// src/commands/resolve.ts
 var STRATEGIES = ["local-first", "remote-first", "duplicate"];
+var CHOICE_NAMES = {
+  local: "\uB85C\uCEEC \uC720\uC9C0 (Obsidian \uBC84\uC804 \uC720\uC9C0)",
+  remote: "\uC6D0\uACA9 \uC720\uC9C0 (Notion \uBC84\uC804\uC73C\uB85C \uB36E\uC5B4\uC4F0\uAE30)",
+  merge: "\uC790\uB3D9 \uBCD1\uD569 (3-way merge)",
+  duplicate: "\uBCF5\uC81C (\uC6D0\uBCF8 \uC720\uC9C0 + \uC62C\uB9AC\uC9C0 \uC54A\uB294 .conflict \uC0AC\uBCF8 \uC0DD\uC131)"
+};
+var REMOTE_DELETION_CHOICE_NAMES = {
+  local: "\uB85C\uCEEC \uC720\uC9C0 (Notion \uC5D0 \uC0C8 \uD398\uC774\uC9C0\uB85C \uB2E4\uC2DC \uB9CC\uB4E4\uAE30)",
+  remote: "\uC0AD\uC81C \uB530\uB974\uAE30 (Obsidian \uD30C\uC77C\uB3C4 \uC9C0\uC6B0\uAE30)"
+};
+var PULL_ONLY_REMOTE_DELETION_CHOICE_NAMES = {
+  local: "\uB85C\uCEEC \uC720\uC9C0 (Obsidian \uD30C\uC77C\uB9CC \uB450\uAE30 \u2014 \uBC1B\uAE30 \uC804\uC6A9\uC774\uB77C Notion \uC5D0 \uB9CC\uB4E4\uC9C0 \uC54A\uC74C)"
+};
+function choiceName(conflict, choice, uploads) {
+  const deleted = isRemoteDeletion2(conflict);
+  return (deleted && !uploads ? PULL_ONLY_REMOTE_DELETION_CHOICE_NAMES[choice] : void 0) ?? (deleted ? REMOTE_DELETION_CHOICE_NAMES[choice] : void 0) ?? CHOICE_NAMES[choice] ?? choice;
+}
 function isInteractive() {
   return process.stdin.isTTY === true && process.stdout.isTTY === true;
 }
-var resolveCommand = new Command8("resolve").description("\uCDA9\uB3CC\uC744 \uD574\uACB0\uD569\uB2C8\uB2E4").option("-s, --strategy <strategy>", `\uC790\uB3D9 \uD574\uACB0 \uC804\uB7B5 (${STRATEGIES.join(" | ")})`).option("-y, --yes", "\uD655\uC778 \uD504\uB86C\uD504\uD2B8 \uC5C6\uC774 \uC9C4\uD589 (\uBE44\uB300\uD654\uD615/CI)").action(async (options) => {
+var resolveCommand = new Command9("resolve").description("\uCDA9\uB3CC\uC744 \uD574\uACB0\uD569\uB2C8\uB2E4").option("-s, --strategy <strategy>", `\uC790\uB3D9 \uD574\uACB0 \uC804\uB7B5 (${STRATEGIES.join(" | ")})`).option("-y, --yes", "\uD655\uC778 \uD504\uB86C\uD504\uD2B8 \uC5C6\uC774 \uC9C4\uD589 (\uBE44\uB300\uD654\uD615/CI)").action(async (options) => {
   if (options.strategy && !STRATEGIES.includes(options.strategy)) {
     console.error(`\uC54C \uC218 \uC5C6\uB294 \uC804\uB7B5 '${options.strategy}' \u2014 \uC0AC\uC6A9 \uAC00\uB2A5: ${STRATEGIES.join(", ")}`);
     process.exitCode = 1;
     return;
   }
   const cwd = process.cwd();
-  const configManager = new ConfigManager8(cwd);
+  const configManager = new ConfigManager9(cwd);
   let stateDb;
   try {
     const config = await configManager.load();
-    stateDb = StateDB7.open(configManager.dbPath);
-    const client = NotionClient8.fromConfig(config);
-    const vaultFs = new NodeVaultFS7(cwd, config.paths);
-    const orchestrator = new SyncOrchestrator7(config, stateDb, client, vaultFs);
+    stateDb = StateDB8.open(configManager.dbPath);
+    const client = NotionClient9.fromConfig(config);
+    const vaultFs = new NodeVaultFS8(cwd, config.paths);
+    const orchestrator = new SyncOrchestrator8(config, stateDb, client, vaultFs);
     const conflicts = await orchestrator.listConflicts();
     if (conflicts.length === 0) {
       console.log("\uCDA9\uB3CC\uC774 \uC5C6\uC2B5\uB2C8\uB2E4.");
@@ -733,8 +986,20 @@ ${cleared.size}\uAC74 \uBAA8\uB450 \uC774\uBBF8 \uD574\uC18C\uB41C \uC0C1\uD0DC\
     console.log(`
 \uCDA9\uB3CC ${pending.length}\uAC74 \uBC1C\uACAC
 `);
+    const uploads = config.sync.direction !== "pull";
+    if (!uploads) {
+      console.log(
+        "  \uBC1B\uAE30 \uC804\uC6A9(direction: pull) \u2014 \uD574\uACB0 \uACB0\uACFC\uB294 Obsidian \uC5D0\uB9CC \uB450\uACE0 Notion \uC5D0\uB294 \uC62C\uB9AC\uC9C0 \uC54A\uC2B5\uB2C8\uB2E4\n"
+      );
+    }
     if (options.strategy) {
       const strategy = options.strategy;
+      const deletions = pending.filter(isRemoteDeletion2).length;
+      if (deletions > 0) {
+        console.log(
+          `  Notion \uC5D0\uC11C \uC0AD\uC81C\uB41C \uB178\uD2B8 ${deletions}\uAC74 \u2014 ${strategy === "remote-first" ? "Obsidian \uD30C\uC77C\uB3C4 \uC9C0\uC6C1\uB2C8\uB2E4" : uploads ? "Notion \uC5D0 \uC0C8 \uD398\uC774\uC9C0\uB85C \uB2E4\uC2DC \uB9CC\uB4ED\uB2C8\uB2E4" : "Obsidian \uD30C\uC77C\uC744 \uADF8\uB300\uB85C \uB461\uB2C8\uB2E4"}`
+        );
+      }
       if (!options.yes) {
         if (!isInteractive()) {
           console.error(
@@ -750,17 +1015,20 @@ ${cleared.size}\uAC74 \uBAA8\uB450 \uC774\uBBF8 \uD574\uC18C\uB41C \uC0C1\uD0DC\
       }
       const results = await orchestrator.resolveAllConflicts(pending, strategy);
       let failed2 = 0;
-      for (const result of results) {
+      for (const [index, result] of results.entries()) {
         if (!result.success) failed2++;
         const icon = result.success ? "\x1B[32m\u2713\x1B[0m" : "\x1B[31m\u2717\x1B[0m";
-        console.log(`  ${icon} ${result.path} \u2192 ${result.choice}`);
+        const reason = result.error ? ` \u2014 ${result.error}` : "";
+        console.log(
+          `  ${icon} ${result.path} \u2192 ${choiceName(pending[index], result.choice, uploads)}${reason}`
+        );
       }
       report(results.length - failed2, failed2);
       return;
     }
     if (!isInteractive()) {
       console.error(
-        "\uBE44\uB300\uD654\uD615 \uD658\uACBD\uC5D0\uC11C\uB294 \uB300\uD654\uD615 \uD574\uACB0\uC744 \uC4F8 \uC218 \uC5C6\uC2B5\uB2C8\uB2E4 \u2014 --strategy <local-first|remote-first|duplicate> --yes \uB97C \uC9C0\uC815\uD558\uC138\uC694."
+        `\uBE44\uB300\uD654\uD615 \uD658\uACBD\uC5D0\uC11C\uB294 \uB300\uD654\uD615 \uD574\uACB0\uC744 \uC4F8 \uC218 \uC5C6\uC2B5\uB2C8\uB2E4 \u2014 --strategy <${STRATEGIES.join("|")}> --yes \uB97C \uC9C0\uC815\uD558\uC138\uC694.`
       );
       process.exitCode = 1;
       return;
@@ -768,12 +1036,12 @@ ${cleared.size}\uAC74 \uBAA8\uB450 \uC774\uBBF8 \uD574\uC18C\uB41C \uC0C1\uD0DC\
     let resolved = 0;
     let failed = 0;
     for (const conflict of pending) {
-      if (await resolveInteractive(conflict, orchestrator)) resolved++;
+      if (await resolveInteractive(conflict, orchestrator, uploads)) resolved++;
       else failed++;
     }
     report(resolved, failed);
   } catch (error) {
-    console.error("\uC624\uB958:", error instanceof Error ? error.message : String(error));
+    console.error("\uC624\uB958:", describeFailure(error));
     process.exitCode = 1;
   } finally {
     stateDb?.close();
@@ -789,37 +1057,29 @@ function report(resolved, failed) {
 \x1B[33m\uCDA9\uB3CC ${resolved}\uAC74 \uD574\uACB0 \xB7 ${failed}\uAC74 \uBBF8\uD574\uACB0\x1B[0m`);
   process.exitCode = 1;
 }
-async function resolveInteractive(conflict, orchestrator) {
+async function resolveInteractive(conflict, orchestrator, uploads) {
   const path = conflict.syncRecord.obsidianPath;
   console.log(`
 ${"\u2500".repeat(60)}`);
   console.log(`\uD30C\uC77C: \x1B[1m${path}\x1B[0m`);
   console.log(`${"\u2500".repeat(60)}`);
-  const diff = orchestrator.generateConflictDiff(conflict);
-  const diffLines = diff.split("\n");
-  for (const line of diffLines) {
-    if (line.startsWith("- ")) {
-      console.log(`\x1B[31m${line}\x1B[0m`);
-    } else if (line.startsWith("+ ")) {
-      console.log(`\x1B[32m${line}\x1B[0m`);
-    } else if (line.startsWith("---") || line.startsWith("+++")) {
-      console.log(`\x1B[1m${line}\x1B[0m`);
-    } else {
-      console.log(line);
-    }
+  if (isRemoteDeletion2(conflict)) {
+    console.log(
+      "\x1B[33mNotion \uC5D0\uC11C \uC0AD\uC81C\uB41C \uB178\uD2B8\uC785\uB2C8\uB2E4 \u2014 Notion \uC5D0 \uC62C\uB9AC\uC9C0 \uC54A\uC740 \uB85C\uCEEC \uD3B8\uC9D1\uC774 \uB0A8\uC544 \uC788\uC2B5\uB2C8\uB2E4.\x1B[0m"
+    );
+  } else {
+    printUnifiedDiff(orchestrator.generateConflictDiff(conflict).split("\n"), true);
   }
   const choice = await select({
     message: "\uC5B4\uB5BB\uAC8C \uD574\uACB0\uD560\uAE4C\uC694?",
-    choices: [
-      { name: "\uB85C\uCEEC \uC720\uC9C0 (Obsidian \uBC84\uC804 \uC720\uC9C0)", value: "local" },
-      { name: "\uC6D0\uACA9 \uC720\uC9C0 (Notion \uBC84\uC804\uC73C\uB85C \uB36E\uC5B4\uC4F0\uAE30)", value: "remote" },
-      { name: "\uC790\uB3D9 \uBCD1\uD569 (3-way merge)", value: "merge" },
-      { name: "\uBCF5\uC81C (\uC6D0\uBCF8 \uC720\uC9C0 + .conflict \uD30C\uC77C \uC0DD\uC131)", value: "duplicate" }
-    ]
+    choices: applicableChoices(conflict).map((value) => ({
+      name: choiceName(conflict, value, uploads),
+      value
+    }))
   });
   const result = await orchestrator.resolveConflict(conflict, choice);
   if (result.success) {
-    console.log(`\x1B[32m\u2713 ${path} \u2192 ${choice}\uB85C \uD574\uACB0\x1B[0m`);
+    console.log(`\x1B[32m\u2713 ${path} \u2192 ${choiceName(conflict, choice, uploads)}\x1B[0m`);
     return true;
   }
   if (result.mergeHadConflicts) {
@@ -831,18 +1091,20 @@ ${"\u2500".repeat(60)}`);
 }
 
 // src/commands/watch.ts
-import { Command as Command9 } from "commander";
+import { Command as Command10 } from "commander";
 import {
-  ConfigManager as ConfigManager9,
-  StateDB as StateDB8,
-  NotionClient as NotionClient9,
-  SyncOrchestrator as SyncOrchestrator8,
-  NodeVaultFS as NodeVaultFS8,
-  WatchSyncService
+  ConfigManager as ConfigManager10,
+  StateDB as StateDB9,
+  NotionClient as NotionClient10,
+  SyncOrchestrator as SyncOrchestrator9,
+  NodeVaultFS as NodeVaultFS9,
+  WatchSyncService,
+  DEFAULT_WATCH_DEBOUNCE_MS
 } from "@im-nobsidian/core";
 function formatResult(result) {
   const pull = `Pull: +${result.pull.created} ~${result.pull.updated} -${result.pull.deleted}`;
-  const push = `Push: +${result.push.created} ~${result.push.updated} -${result.push.deleted}`;
+  const moved = result.push.moved > 0 ? ` \u2192${result.push.moved}` : "";
+  const push = `Push: +${result.push.created} ~${result.push.updated} -${result.push.deleted}${moved}`;
   const parts = [pull, push];
   if (result.conflicts.length > 0) {
     parts.push(`\uCDA9\uB3CC ${result.conflicts.length}\uAC74`);
@@ -852,35 +1114,59 @@ function formatResult(result) {
 function timestamp() {
   return (/* @__PURE__ */ new Date()).toLocaleTimeString("ko-KR", { hour12: false });
 }
-var watchCommand = new Command9("watch").description("\uD30C\uC77C \uBCC0\uACBD \uAC10\uC9C0 + \uC790\uB3D9 \uB3D9\uAE30\uD654").option("-d, --debounce <ms>", "\uB514\uBC14\uC6B4\uC2A4 \uB300\uAE30 \uC2DC\uAC04(ms)", "2000").option("-i, --interval <seconds>", "\uD480 \uB3D9\uAE30\uD654 \uC8FC\uAE30(\uCD08, 0\uC774\uBA74 \uBE44\uD65C\uC131)", "0").action(async (options) => {
+function syncLabel(scope) {
+  return scope === "full" ? "\uC8FC\uAE30\uC801 \uB3D9\uAE30\uD654" : "\uB3D9\uAE30\uD654";
+}
+var watchCommand = new Command10("watch").description("\uD30C\uC77C \uBCC0\uACBD \uAC10\uC9C0 + \uC790\uB3D9 \uB3D9\uAE30\uD654").option("-d, --debounce <ms>", "\uB514\uBC14\uC6B4\uC2A4 \uB300\uAE30 \uC2DC\uAC04(ms)", String(DEFAULT_WATCH_DEBOUNCE_MS)).option("-i, --interval <seconds>", "\uD480 \uB3D9\uAE30\uD654 \uC8FC\uAE30(\uCD08, 0\uC774\uBA74 \uBE44\uD65C\uC131)", "0").action(async (options) => {
+  const debounceMs = Number(options.debounce);
+  const intervalSec = Number(options.interval);
+  if (!Number.isInteger(debounceMs) || debounceMs < 0) {
+    console.error(`--debounce \uB294 0 \uC774\uC0C1\uC758 \uC815\uC218(ms)\uC5EC\uC57C \uD569\uB2C8\uB2E4: ${options.debounce}`);
+    process.exitCode = 1;
+    return;
+  }
+  if (!Number.isInteger(intervalSec) || intervalSec < 0) {
+    console.error(`--interval \uC740 0 \uC774\uC0C1\uC758 \uC815\uC218(\uCD08)\uC5EC\uC57C \uD569\uB2C8\uB2E4: ${options.interval}`);
+    process.exitCode = 1;
+    return;
+  }
   const cwd = process.cwd();
-  const configManager = new ConfigManager9(cwd);
+  const configManager = new ConfigManager10(cwd);
   const config = await configManager.load();
-  const stateDb = StateDB8.open(configManager.dbPath);
-  const client = NotionClient9.fromConfig(config);
-  const vaultFs = new NodeVaultFS8(cwd, config.paths);
-  const orchestrator = new SyncOrchestrator8(config, stateDb, client, vaultFs);
-  const debounceMs = parseInt(options.debounce, 10);
-  const intervalSec = parseInt(options.interval, 10);
+  const stateDb = StateDB9.open(configManager.dbPath);
+  const client = NotionClient10.fromConfig(config);
+  const vaultFs = new NodeVaultFS9(cwd, config.paths);
+  const orchestrator = new SyncOrchestrator9(config, stateDb, client, vaultFs);
   const service = new WatchSyncService(cwd, orchestrator, {
     debounceMs,
     onFileChange: (event, path) => {
       console.log(`[${timestamp()}] ${event}: ${path}`);
     },
-    onSyncStart: () => {
-      console.log(`[${timestamp()}] \uB3D9\uAE30\uD654 \uC2DC\uC791...`);
+    onSyncStart: (scope) => {
+      console.log(`[${timestamp()}] ${syncLabel(scope)} \uC2DC\uC791...`);
+    },
+    onSyncComplete: (result, scope) => {
+      console.log(`[${timestamp()}] ${syncLabel(scope)} \uC644\uB8CC \u2014 ${formatResult(result)}`);
     },
-    onSyncComplete: (result) => {
-      console.log(`[${timestamp()}] \uB3D9\uAE30\uD654 \uC644\uB8CC \u2014 ${formatResult(result)}`);
+    onSyncCancelled: (result, scope) => {
+      console.log(
+        `[${timestamp()}] ${syncLabel(scope)} \uCDE8\uC18C \u2014 \uBA48\uCD94\uAE30 \uC804\uAE4C\uC9C0 ${formatResult(result)}`
+      );
     },
-    onSyncError: (error) => {
-      console.error(`[${timestamp()}] \uB3D9\uAE30\uD654 \uC2E4\uD328: ${error.message}`);
+    onSyncError: (error, scope) => {
+      console.error(`[${timestamp()}] ${syncLabel(scope)} \uC2E4\uD328: ${error.message}`);
     }
   });
   let pullTimer = null;
+  let shuttingDown = false;
   const shutdown = async () => {
+    if (shuttingDown) {
+      console.log(`[${timestamp()}] \uAC15\uC81C \uC885\uB8CC`);
+      return process.exit(1);
+    }
+    shuttingDown = true;
     console.log(`
-[${timestamp()}] \uAC10\uC2DC \uC885\uB8CC \uC911...`);
+[${timestamp()}] \uAC10\uC2DC \uC885\uB8CC \uC911... (\uB3C4\uB294 \uB3D9\uAE30\uD654\uB97C \uBA48\uCD94\uACE0 \uAE30\uB2E4\uB9BD\uB2C8\uB2E4)`);
     if (pullTimer) clearInterval(pullTimer);
     await service.stop();
     stateDb.close();
@@ -893,30 +1179,20 @@ var watchCommand = new Command9("watch").description("\uD30C\uC77C \uBCC0\uACBD
   console.log(`[${timestamp()}] \uD30C\uC77C \uAC10\uC2DC \uC2DC\uC791 (debounce: ${debounceMs}ms)`);
   if (intervalSec > 0) {
     console.log(`[${timestamp()}] \uD480 \uB3D9\uAE30\uD654 \uC8FC\uAE30: ${intervalSec}\uCD08`);
-    pullTimer = setInterval(async () => {
-      if (service.isSyncing()) return;
-      try {
-        console.log(`[${timestamp()}] \uC8FC\uAE30\uC801 \uB3D9\uAE30\uD654 \uC2DC\uC791...`);
-        const result = await orchestrator.sync();
-        console.log(`[${timestamp()}] \uC8FC\uAE30\uC801 \uB3D9\uAE30\uD654 \uC644\uB8CC \u2014 ${formatResult(result)}`);
-      } catch (error) {
-        const msg = error instanceof Error ? error.message : String(error);
-        console.error(`[${timestamp()}] \uC8FC\uAE30\uC801 \uB3D9\uAE30\uD654 \uC2E4\uD328: ${msg}`);
-      }
-    }, intervalSec * 1e3);
+    pullTimer = setInterval(() => service.requestFullSync(), intervalSec * 1e3);
   }
   await new Promise(() => {
   });
 });
 
 // src/commands/verify.ts
-import { Command as Command10 } from "commander";
+import { Command as Command11 } from "commander";
 import {
-  ConfigManager as ConfigManager10,
-  StateDB as StateDB9,
-  NotionClient as NotionClient10,
-  SyncOrchestrator as SyncOrchestrator9,
-  NodeVaultFS as NodeVaultFS9
+  ConfigManager as ConfigManager11,
+  StateDB as StateDB10,
+  NotionClient as NotionClient11,
+  SyncOrchestrator as SyncOrchestrator10,
+  NodeVaultFS as NodeVaultFS10
 } from "@im-nobsidian/core";
 import chalk7 from "chalk";
 var SAMPLE_LIMIT = 10;
@@ -1006,15 +1282,15 @@ function printReport(report2) {
     );
   }
 }
-var verifyCommand = new Command10("verify").description("\uC644\uACB0\uC131 \uAC80\uC99D \u2014 \uC6D0\uACA9 DB \uD589\xB7\uD398\uC774\uC9C0\uAC00 \uBCFC\uD2B8\uC5D0 \uBE60\uC9D0\uC5C6\uC774 \uC788\uB294\uC9C0 \uB300\uC870 (API \uD638\uCD9C)").option("--json", "\uACB0\uACFC\uB97C JSON \uC73C\uB85C \uCD9C\uB825").action(async (opts) => {
+var verifyCommand = new Command11("verify").description("\uC644\uACB0\uC131 \uAC80\uC99D \u2014 \uC6D0\uACA9 DB \uD589\xB7\uD398\uC774\uC9C0\uAC00 \uBCFC\uD2B8\uC5D0 \uBE60\uC9D0\uC5C6\uC774 \uC788\uB294\uC9C0 \uB300\uC870 (API \uD638\uCD9C)").option("--json", "\uACB0\uACFC\uB97C JSON \uC73C\uB85C \uCD9C\uB825").action(async (opts) => {
   const cwd = process.cwd();
-  const configManager = new ConfigManager10(cwd);
+  const configManager = new ConfigManager11(cwd);
   const config = await configManager.load();
-  const stateDb = StateDB9.open(configManager.dbPath);
+  const stateDb = StateDB10.open(configManager.dbPath);
   try {
-    const client = NotionClient10.fromConfig(config);
-    const vaultFs = new NodeVaultFS9(cwd, config.paths);
-    const orchestrator = new SyncOrchestrator9(config, stateDb, client, vaultFs);
+    const client = NotionClient11.fromConfig(config);
+    const vaultFs = new NodeVaultFS10(cwd, config.paths);
+    const orchestrator = new SyncOrchestrator10(config, stateDb, client, vaultFs);
     const report2 = await orchestrator.verifyCompleteness();
     if (opts.json) {
       console.log(JSON.stringify(report2, null, 2));
@@ -1044,7 +1320,7 @@ function scheduleForcedExit(proc, schedule = setTimeout) {
 // src/index.ts
 var requireJson = createRequire(import.meta.url);
 var { version } = requireJson("../package.json");
-var program = new Command11();
+var program = new Command12();
 program.name("im-nobsidian").description("Im-Nobsidian: Obsidian \u2194 Notion \uC591\uBC29\uD5A5 \uB3D9\uAE30\uD654 CLI").version(version).option("--verbose", "\uC0C1\uC138 \uB85C\uADF8 \uCD9C\uB825").option("--quiet", "\uCD5C\uC18C \uCD9C\uB825");
 program.addCommand(initCommand);
 program.addCommand(pushCommand);
@@ -1052,11 +1328,18 @@ program.addCommand(pullCommand);
 program.addCommand(syncCommand);
 program.addCommand(statusCommand);
 program.addCommand(diffCommand);
+program.addCommand(discardCommand);
 program.addCommand(fetchCommand);
 program.addCommand(resolveCommand);
 program.addCommand(watchCommand);
 program.addCommand(verifyCommand);
-program.parseAsync().then(() => {
-  scheduleForcedExit(process);
-});
+program.parseAsync().then(
+  () => {
+    scheduleForcedExit(process);
+  },
+  (error) => {
+    reportStateDbFailure(error, process);
+    scheduleForcedExit(process);
+  }
+);
 //# sourceMappingURL=index.js.map