im-nobsidian 0.14.1 → 0.16.0

package/dist/index.js

@@ -134,6 +134,40 @@ function restoredLines(paths, dryRun = false) {
     ...pathLines(paths)
   ];
 }
+function relinkedLines(paths, pending) {
+  if (pending) {
+    return [
+      chalk.cyan(
+        "\u21BB \uC0C1\uD0DC \uAE30\uB85D\uC5D0 Notion \uACFC \uC774\uC740 \uB178\uD2B8\uAC00 \uC5C6\uC2B5\uB2C8\uB2E4 \u2014 \uBC1B\uC73C\uBA74 \uAC19\uC740 \uC790\uB9AC\uC5D0 \uC788\uB294 \uB178\uD2B8\uB294 \uC0C8\uB85C \uB9CC\uB4E4\uC9C0 \uC54A\uACE0 \uADF8 \uD398\uC774\uC9C0\uC640 \uB2E4\uC2DC \uC787\uC2B5\uB2C8\uB2E4(\uAE00\uC774 \uB2E4\uB974\uBA74 \uCDA9\uB3CC). \uBBF8\uB9AC \uBCF4\uAE30\uB294 \uADF8 \uB178\uD2B8\uB4E4\uB3C4 \uC0DD\uC131\uC73C\uB85C \uC149\uB2C8\uB2E4"
+      )
+    ];
+  }
+  if (!paths || paths.length === 0) return [];
+  return [
+    chalk.cyan(
+      `\u21BB \uC0C1\uD0DC \uAE30\uB85D\uC5D0 \uC5C6\uB358 \uB178\uD2B8 ${paths.length}\uAC1C\uB97C \uAC19\uC740 \uC790\uB9AC\uC758 Notion \uD398\uC774\uC9C0\uC640 \uB2E4\uC2DC \uC774\uC5C8\uC2B5\uB2C8\uB2E4 \u2014 \uC0C8\uB85C \uBC1B\uC9C0 \uC54A\uC558\uC2B5\uB2C8\uB2E4:`
+    ),
+    ...pathLines(paths)
+  ];
+}
+function mergedLines(paths, then, dryRun = false) {
+  if (!paths || paths.length === 0) return [];
+  return [
+    chalk.cyan(
+      `\u21BB \uC591\uCABD\uC774 \uB2E4\uB978 \uC904\uC744 \uACE0\uCE5C \uB178\uD2B8 ${paths.length}\uAC1C\uB97C ${dryRun ? "\uD569\uCE69\uB2C8\uB2E4" : "\uD569\uCCE4\uC2B5\uB2C8\uB2E4"} \u2014 ` + (then === "push" ? "push \uD558\uBA74 \uD569\uCE5C \uAE00\uC744 Notion \uC5D0 \uC62C\uB9BD\uB2C8\uB2E4:" : "\uD569\uCE5C \uAE00\uC744 Notion \uC5D0 \uC62C\uB9BD\uB2C8\uB2E4:")
+    ),
+    ...pathLines(paths)
+  ];
+}
+function plannedConflictLines(paths) {
+  if (paths.length === 0) return [];
+  return [
+    chalk.magenta(
+      `\u26A0 \uC591\uCABD\uC744 \uACE0\uCE5C \uB178\uD2B8 ${paths.length}\uAC1C\uB294 \uBC1B\uC73C\uBA74 \uCDA9\uB3CC\uB85C \uB0A8\uC2B5\uB2C8\uB2E4 \u2014 \uBC1B\uC740 \uB4A4 nobsi resolve \uB85C \uACE0\uB974\uC138\uC694:`
+    ),
+    ...pathLines(paths)
+  ];
+}
 function schemaFollowedLines(followed) {
   const lines = [];
   for (const db of followed ?? []) {
@@ -169,6 +203,9 @@ function schemaEditLines(edits, dryRun = false) {
       ...edit.renamed.length > 0 ? [`\uC774\uB984 ${edit.renamed.map(([from, to]) => `${from} \u2192 ${to}`).join(", ")}`] : [],
       ...edit.retyped.length > 0 ? [`\uD0C0\uC785 ${edit.retyped.map(([name, type]) => `${name} \u2192 ${type}`).join(", ")}`] : [],
       ...edit.redefined.length > 0 ? [`\uC124\uC815 ${edit.redefined.join(", ")}`] : [],
+      ...(edit.renamedOptions ?? []).map(
+        ([name, from, to]) => `${name} \uC635\uC158 \uC774\uB984 ${from} \u2192 ${to}(\uADF8 \uAC12\uC744 \uAC00\uC9C4 \uD589\uB3C4 \uC62E\uAE41\uB2C8\uB2E4)`
+      ),
       ...(edit.droppedOptions ?? []).map(
         ([name, options]) => `${name} \uC635\uC158 \uC9C0\uC6C0 ${options.join(", ")}(\uADF8 \uAC12\uC744 \uAC00\uC9C4 \uD589\uC740 Notion \uC5D0\uC11C \uBE48 \uAC12\uC774 \uB429\uB2C8\uB2E4)`
       )
@@ -178,6 +215,12 @@ function schemaEditLines(edits, dryRun = false) {
 }
 function viewEditLines(edits, dryRun = false) {
   return (edits ?? []).map((edit) => {
+    if (edit.action === "created") {
+      return `${icons.success} .base \uC5D0\uC11C \uB354\uD55C \uBCF4\uAE30\uB97C Notion \uC5D0 ${dryRun ? "\uB9CC\uB4ED\uB2C8\uB2E4" : "\uB9CC\uB4E4\uC5C8\uC2B5\uB2C8\uB2E4"} \u2014 ${edit.path}: ${edit.view}`;
+    }
+    if (edit.action === "deleted") {
+      return `${icons.success} .base \uC5D0\uC11C \uC9C0\uC6B4 \uBCF4\uAE30\uB97C Notion \uC5D0\uC11C ${dryRun ? "\uC9C0\uC6C1\uB2C8\uB2E4" : "\uC9C0\uC6E0\uC2B5\uB2C8\uB2E4"} \u2014 ${edit.path}: ${edit.view}`;
+    }
     const name = edit.from ? `${edit.from} \u2192 ${edit.view}` : edit.view;
     return `${icons.success} .base \uC5D0\uC11C \uACE0\uCE5C \uBCF4\uAE30\uB97C Notion \uC5D0 ${dryRun ? "\uC62C\uB9BD\uB2C8\uB2E4" : "\uC62C\uB838\uC2B5\uB2C8\uB2E4"} \u2014 ${edit.path}: ${name} (${edit.changed.map((field) => VIEW_FIELD_LABELS[field]).join(" \xB7 ")})`;
   });
@@ -206,7 +249,7 @@ function heldBaseLines(paths) {
   if (!paths || paths.length === 0) return [];
   return [
     chalk.yellow(
-      `\u26A0 \uBCF4\uAE30\uB97C \uACE0\uCE5C .base ${paths.length}\uAC1C\uB294 \uB36E\uC5B4\uC4F0\uC9C0 \uC54A\uC558\uC2B5\uB2C8\uB2E4 \u2014 push \uD558\uBA74 \uACE0\uCE5C \uBCF4\uAE30 \uC774\uB984 \xB7 \uC5F4 \xB7 \uC815\uB82C \xB7 \uD544\uD130\uB97C Notion \uC5D0 \uC62C\uB9BD\uB2C8\uB2E4:`
+      `\u26A0 \uBCF4\uAE30\uB97C \uACE0\uCE5C .base ${paths.length}\uAC1C\uB294 \uB36E\uC5B4\uC4F0\uC9C0 \uC54A\uC558\uC2B5\uB2C8\uB2E4 \u2014 push \uD558\uBA74 \uACE0\uCE5C \uBCF4\uAE30 \uC774\uB984 \xB7 \uC5F4 \xB7 \uC815\uB82C \xB7 \uD544\uD130\uC640 \uB354\uD558\uACE0 \uC9C0\uC6B4 \uBCF4\uAE30\uB97C Notion \uC5D0 \uC62C\uB9BD\uB2C8\uB2E4:`
     ),
     ...pathLines(paths)
   ];
@@ -232,7 +275,7 @@ function readOnlySkipLines(skips, dryRun = false) {
 }
 
 // src/utils/vault.ts
-import { existsSync } from "fs";
+import { existsSync, readFileSync } from "fs";
 import { dirname, join, relative } from "path";
 import {
   ConfigManager,
@@ -241,26 +284,57 @@ import {
   matchesPathScope,
   ScopedVaultFS,
   findConnectionFolders,
-  OBSIDIAN_CONFIG_DIR
+  OBSIDIAN_CONFIG_DIR,
+  IGNORE_FILE,
+  obsidianOnlyExcludes,
+  templateFolders
 } from "@im-nobsidian/core";
 async function nestedConnections(cwd) {
   return (await findConnectionFolders(cwd)).filter((folder) => folder !== "");
 }
 async function openVaultFs(cwd, paths) {
-  const base = new NodeVaultFS(cwd, paths);
+  const base = new NodeVaultFS(cwd, {
+    ...paths,
+    exclude: [...paths.exclude ?? [], ...obsidianOnlyPatterns(cwd, paths)]
+  });
   const nested = await nestedConnections(cwd);
   return nested.length === 0 ? base : new ScopedVaultFS(base, "", ["", ...nested]);
 }
+async function outsideVault(cwd, paths) {
+  const root = vaultRoot(cwd);
+  if (root === null) return void 0;
+  const folder = relative(root, cwd).split("\\").join("/");
+  const whole = folder === "" && (paths.include ?? []).length === 0 && (paths.exclude ?? []).length === 0 && paths.excludeObsidianOnly !== true && !existsSync(join(cwd, IGNORE_FILE)) && (await nestedConnections(cwd)).length === 0;
+  return whole ? void 0 : { fs: new NodeVaultFS(root, {}, false), folder };
+}
+function obsidianOnlyPatterns(cwd, paths) {
+  if (paths.excludeObsidianOnly !== true) return [];
+  const root = vaultRoot(cwd);
+  if (root === null) return obsidianOnlyExcludes([], "");
+  const read = (file) => {
+    try {
+      return readFileSync(join(root, OBSIDIAN_CONFIG_DIR, file), "utf-8");
+    } catch {
+      return null;
+    }
+  };
+  return obsidianOnlyExcludes(
+    templateFolders(read),
+    relative(root, cwd).split("\\").join("/").normalize("NFC")
+  );
+}
+function vaultRoot(cwd) {
+  for (let dir = cwd; ; dir = dirname(dir)) {
+    if (existsSync(join(dir, OBSIDIAN_CONFIG_DIR))) return dir;
+    if (dirname(dir) === dir) return null;
+  }
+}
 function vaultArgPath(path, platform = process.platform) {
   return platform === "win32" ? path.replace(/\\/g, "/") : path;
 }
 function obsidianConfigDir(cwd) {
-  for (let dir = cwd; ; dir = dirname(dir)) {
-    if (existsSync(join(dir, OBSIDIAN_CONFIG_DIR))) {
-      return relative(cwd, join(dir, OBSIDIAN_CONFIG_DIR)).split("\\").join("/");
-    }
-    if (dirname(dir) === dir) return OBSIDIAN_CONFIG_DIR;
-  }
+  const root = vaultRoot(cwd);
+  return root === null ? OBSIDIAN_CONFIG_DIR : relative(cwd, join(root, OBSIDIAN_CONFIG_DIR)).split("\\").join("/");
 }
 function outerConnectionTracking(cwd) {
   for (let dir = dirname(cwd); ; dir = dirname(dir)) {
@@ -403,12 +477,31 @@ function extractPageTitle(page) {
 import { Command as Command2 } from "commander";
 import { ConfigManager as ConfigManager3, StateDB as StateDB2, NotionClient as NotionClient2, SyncOrchestrator } from "@im-nobsidian/core";
 
-// src/utils/json-output.ts
+// src/utils/log-level.ts
 import { setLogger } from "@im-nobsidian/core";
+var level = "normal";
+var noop = () => {
+};
+function applyLogLevel(next, sink) {
+  level = next;
+  const out = (fallback) => sink ?? fallback;
+  setLogger({
+    error: out((message, ...args) => console.error(message, ...args)),
+    warn: level === "quiet" ? noop : out((message, ...args) => console.warn(message, ...args)),
+    info: level === "verbose" ? out((message, ...args) => console.info(message, ...args)) : noop,
+    debug: level === "verbose" ? out((message, ...args) => console.debug(message, ...args)) : noop
+  });
+}
+function currentLogLevel() {
+  return level;
+}
+function logLevelOf(options) {
+  return options.verbose ? "verbose" : options.quiet ? "quiet" : "normal";
+}
+
+// src/utils/json-output.ts
 function enableJsonMode() {
-  const toStderr = (message, ...args) => console.error(message, ...args);
-  setLogger({ warn: toStderr, error: toStderr, info: toStderr, debug: () => {
-  } });
+  applyLogLevel(currentLogLevel(), (message, ...args) => console.error(message, ...args));
 }
 function pushDbChangeCount(result) {
   return (result.createdDatabases ?? 0) + (result.renamedProperties?.length ?? 0) + (result.schemaEdits?.length ?? 0) + (result.viewEdits?.length ?? 0);
@@ -439,6 +532,9 @@ function pullJson(result) {
     deleted: result.deleted,
     restored: result.restored,
     restoredPaths: result.restoredPaths ?? [],
+    mergedPaths: result.mergedPaths ?? [],
+    relinkedPaths: result.relinkedPaths ?? [],
+    relinkPending: result.relinkPending ?? false,
     schemaFollowed: result.schemaFollowed ?? [],
     heldSidecars: result.heldSidecars ?? [],
     heldBases: result.heldBases ?? [],
@@ -463,8 +559,41 @@ function printJson(value) {
 `);
 }
 
+// src/utils/base-filter-prompt.ts
+import { confirm as confirm2 } from "@inquirer/prompts";
+
+// src/utils/interactive.ts
+function isInteractive() {
+  return process.stdin.isTTY === true && process.stdout.isTTY === true;
+}
+
+// src/utils/base-filter-prompt.ts
+async function askUserBaseFilterFixes(orchestrator, options) {
+  if (options.dryRun) return;
+  const fixes = orchestrator.userBaseFilterFixes();
+  if (fixes.length === 0) return;
+  console.log(`
+  ${icons.conflict} \uC9C1\uC811 \uB9CC\uB4E0 .base \uC758 \uD3F4\uB354 \uD544\uD130\uAC00 \uC62E\uAE34 \uD3F4\uB354\uB97C \uAC00\uB9AC\uD0B5\uB2C8\uB2E4:`);
+  for (const fix of fixes) console.log(`    ${dimText(`\xB7 ${fix.path}: ${fix.from} \u2192 ${fix.to}`)}`);
+  let accept;
+  if (options.yes) {
+    accept = true;
+  } else if (!isInteractive()) {
+    console.log(
+      `  ${dimText("\uACE0\uCE58\uB824\uBA74 --yes \uB97C \uBD99\uC5EC \uB2E4\uC2DC \uC2E4\uD589\uD558\uC138\uC694 \u2014 \uB2E4\uC74C \uC2E4\uD589\uC5D0\uC11C \uB2E4\uC2DC \uBB3B\uC2B5\uB2C8\uB2E4")}`
+    );
+    return;
+  } else {
+    accept = await confirm2({ message: "\uC0C8 \uD3F4\uB354\uB85C \uACE0\uCE60\uAE4C\uC694?", default: true });
+  }
+  const fixed = await orchestrator.resolveUserBaseFilterFixes(accept);
+  console.log(
+    accept ? `  ${icons.success} .base ${fixed.length}\uAC1C\uC758 \uD3F4\uB354 \uD544\uD130\uB97C \uACE0\uCCE4\uC2B5\uB2C8\uB2E4` : `  ${dimText("\uADF8\uB300\uB85C \uB461\uB2C8\uB2E4 \u2014 \uB2E4\uC2DC \uBB3B\uC9C0 \uC54A\uC2B5\uB2C8\uB2E4")}`
+  );
+}
+
 // 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) => {
+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)").option("-y, --yes", "\uC9C1\uC811 \uB9CC\uB4E0 .base \uC758 \uD3F4\uB354 \uD544\uD130\uB97C \uBB3B\uC9C0 \uC54A\uACE0 \uACE0\uCE68 (\uBE44\uB300\uD654\uD615/CI)").action(async (options) => {
   const json = options.json === true;
   if (json) enableJsonMode();
   const cwd = process.cwd();
@@ -485,6 +614,7 @@ ${header("  Pushing to Notion...")}`);
       dryRun: options.dryRun,
       paths: options.path?.map((path) => vaultArgPath(path)),
       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);
@@ -533,6 +663,7 @@ ${header("  Pushing to Notion...")}`);
       }
       process.exitCode = 1;
     }
+    await askUserBaseFilterFixes(orchestrator, options);
   } finally {
     stateDb.close();
   }
@@ -545,7 +676,7 @@ import {
   StateDB as StateDB3,
   NotionClient as NotionClient3,
   SyncOrchestrator as SyncOrchestrator2,
-  IGNORE_FILE
+  IGNORE_FILE as IGNORE_FILE2
 } from "@im-nobsidian/core";
 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(
@@ -556,7 +687,7 @@ var pullCommand = new Command3("pull").description("Notion \uBCC0\uACBD\uC0AC\uD
     "--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) => {
+).option("--json", "\uACB0\uACFC\uB97C JSON \uD55C \uC904\uB85C \uCD9C\uB825 (\uC790\uB3D9\uD654\uC6A9 \u2014 \uB85C\uADF8\uB294 stderr)").option("-y, --yes", "\uC9C1\uC811 \uB9CC\uB4E0 .base \uC758 \uD3F4\uB354 \uD544\uD130\uB97C \uBB3B\uC9C0 \uC54A\uACE0 \uACE0\uCE68 (\uBE44\uB300\uD654\uD615/CI)").action(async (options) => {
   const json = options.json === true;
   if (json) enableJsonMode();
   const cwd = process.cwd();
@@ -566,7 +697,14 @@ var pullCommand = new Command3("pull").description("Notion \uBCC0\uACBD\uC0AC\uD
   try {
     const client = NotionClient3.fromConfig(config);
     const vaultFs = await openVaultFs(cwd, config.paths);
-    const orchestrator = new SyncOrchestrator2(config, stateDb, client, vaultFs);
+    const orchestrator = new SyncOrchestrator2(
+      config,
+      stateDb,
+      client,
+      vaultFs,
+      void 0,
+      await outsideVault(cwd, config.paths)
+    );
     if (!json) {
       console.log(`
 ${header("  Pulling from Notion...")}`);
@@ -620,6 +758,12 @@ ${header("  Pulling from Notion...")}`);
     for (const line of restoredLines(result.restoredPaths, options.dryRun)) {
       console.log(`  ${line}`);
     }
+    for (const line of relinkedLines(result.relinkedPaths, result.relinkPending)) {
+      console.log(`  ${line}`);
+    }
+    for (const line of mergedLines(result.mergedPaths, "push", options.dryRun)) {
+      console.log(`  ${line}`);
+    }
     for (const move of result.moved ?? []) {
       const verb = move.renamed ? "rename" : "move";
       console.log(
@@ -629,7 +773,7 @@ ${header("  Pulling from Notion...")}`);
     const excluded = result.excluded ?? [];
     if (excluded.length > 0) {
       console.log(
-        `  ${icons.conflict} ${dimText(`${excluded.length} new in Notion ${options.dryRun ? "would not be" : "not"} pulled \u2014 excluded by paths / ${IGNORE_FILE}:`)}`
+        `  ${icons.conflict} ${dimText(`${excluded.length} new in Notion ${options.dryRun ? "would not be" : "not"} pulled \u2014 excluded by paths / ${IGNORE_FILE2}:`)}`
       );
       for (const path of excluded.slice(0, LISTED_ITEMS))
         console.log(`    ${dimText(`\xB7 ${path}`)}`);
@@ -648,7 +792,13 @@ ${header("  Pulling from Notion...")}`);
     if (result.remoteScan) {
       for (const line of remoteScanLines(result.remoteScan)) console.log(`  ${line}`);
     }
-    if (result.conflicts.length > 0) {
+    if (options.dryRun) {
+      const planned = plannedConflictLines(
+        result.conflicts.map((conflict) => conflict.syncRecord.obsidianPath)
+      );
+      if (planned.length > 0) console.log("");
+      for (const line of planned) console.log(`  ${line}`);
+    } else if (result.conflicts.length > 0) {
       console.log(
         `
   ${icons.conflict} ${chalk3.magenta(`${result.conflicts.length} conflicts`)} \u2014 run ${chalk3.cyan("nobsi resolve")}`
@@ -661,6 +811,7 @@ ${header("  Pulling from Notion...")}`);
       }
       process.exitCode = 1;
     }
+    await askUserBaseFilterFixes(orchestrator, options);
   } finally {
     stateDb.close();
   }
@@ -670,7 +821,7 @@ ${header("  Pulling from Notion...")}`);
 import { Command as Command4 } from "commander";
 import { ConfigManager as ConfigManager5, StateDB as StateDB4, NotionClient as NotionClient4, SyncOrchestrator as SyncOrchestrator3 } 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").option("--json", "\uACB0\uACFC\uB97C JSON \uD55C \uC904\uB85C \uCD9C\uB825 (\uC790\uB3D9\uD654\uC6A9 \u2014 \uB85C\uADF8\uB294 stderr)").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)").option("-y, --yes", "\uC9C1\uC811 \uB9CC\uB4E0 .base \uC758 \uD3F4\uB354 \uD544\uD130\uB97C \uBB3B\uC9C0 \uC54A\uACE0 \uACE0\uCE68 (\uBE44\uB300\uD654\uD615/CI)").action(async (options) => {
   const json = options.json === true;
   if (json) enableJsonMode();
   const log = json ? () => {
@@ -682,7 +833,14 @@ var syncCommand = new Command4("sync").description("\uC591\uBC29\uD5A5 \uB3D9\uA
   try {
     const client = NotionClient4.fromConfig(config);
     const vaultFs = await openVaultFs(cwd, config.paths);
-    const orchestrator = new SyncOrchestrator3(config, stateDb, client, vaultFs);
+    const orchestrator = new SyncOrchestrator3(
+      config,
+      stateDb,
+      client,
+      vaultFs,
+      void 0,
+      await outsideVault(cwd, config.paths)
+    );
     log(`
 ${header("  Bidirectional Sync")}`);
     log(`  ${separator()}`);
@@ -745,6 +903,12 @@ ${header("  Bidirectional Sync")}`);
     for (const line of restoredLines(pullResult.restoredPaths, options.dryRun)) {
       console.log(`  ${line}`);
     }
+    for (const line of relinkedLines(pullResult.relinkedPaths, pullResult.relinkPending)) {
+      console.log(`  ${line}`);
+    }
+    for (const line of mergedLines(pullResult.mergedPaths, "pushed", options.dryRun)) {
+      console.log(`  ${line}`);
+    }
     for (const line of unsentDeletionLines(pushResult.unsentDeletions, options.dryRun)) {
       console.log(`  ${line}`);
     }
@@ -780,7 +944,13 @@ ${header("  Bidirectional Sync")}`);
     if (pullResult.remoteScan) {
       for (const line of remoteScanLines(pullResult.remoteScan)) console.log(`  ${line}`);
     }
-    if (result.conflicts.length > 0) {
+    if (options.dryRun) {
+      const planned = plannedConflictLines(
+        result.conflicts.map((conflict) => conflict.syncRecord.obsidianPath)
+      );
+      if (planned.length > 0) console.log("");
+      for (const line of planned) console.log(`  ${line}`);
+    } else if (result.conflicts.length > 0) {
       console.log(
         `
   ${icons.conflict} ${chalk4.magenta(`${result.conflicts.length} conflicts`)} \u2014 run ${chalk4.cyan("nobsi resolve")}`
@@ -792,6 +962,7 @@ ${header("  Bidirectional Sync")}`);
       for (const f of pushResult.failed) failedItem(f.path, f.error, "\u25B2");
       process.exitCode = 1;
     }
+    await askUserBaseFilterFixes(orchestrator, options);
   } finally {
     stateDb.close();
   }
@@ -804,7 +975,7 @@ import {
   StateDB as StateDB5,
   NotionClient as NotionClient5,
   SyncOrchestrator as SyncOrchestrator4,
-  IGNORE_FILE as IGNORE_FILE2,
+  IGNORE_FILE as IGNORE_FILE3,
   isRemoteDeletion,
   shortNotionId
 } from "@im-nobsidian/core";
@@ -979,7 +1150,7 @@ ${header("  Sync Status")}`);
     if (remoteExcluded.length > 0) {
       console.log(
         `
-  ${header(`New in Notion, not pulled (excluded by paths / ${IGNORE_FILE2}): ${remoteExcluded.length}`)}`
+  ${header(`New in Notion, not pulled (excluded by paths / ${IGNORE_FILE3}): ${remoteExcluded.length}`)}`
       );
       for (const path of remoteExcluded.slice(0, LISTED_ITEMS)) {
         console.log(`    ${dimText("\xB7")} ${path}`);
@@ -1214,7 +1385,7 @@ ${header("  Remote Scan")}`);
 
 // src/commands/resolve.ts
 import { Command as Command9 } from "commander";
-import { select, confirm as confirm2 } from "@inquirer/prompts";
+import { select, confirm as confirm3 } from "@inquirer/prompts";
 import {
   ConfigManager as ConfigManager10,
   StateDB as StateDB9,
@@ -1225,14 +1396,23 @@ import {
 } from "@im-nobsidian/core";
 
 // src/utils/state-db-failure.ts
-import { StateDbUnavailableError } from "@im-nobsidian/core";
+import {
+  ConnectionBoundaryError,
+  ConnectionScopeError,
+  StateDbUnavailableError,
+  SyncBusyError,
+  UnlinkedVaultError
+} 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;
+function isUserFailure(error) {
+  return error instanceof StateDbUnavailableError || error instanceof UnlinkedVaultError || error instanceof SyncBusyError || error instanceof ConnectionBoundaryError || error instanceof ConnectionScopeError;
+}
+function reportUserFailure(error, proc) {
+  if (!isUserFailure(error)) throw error;
   console.error(`\uC624\uB958: ${describeFailure(error)}`);
   proc.exitCode = 1;
 }
@@ -1256,9 +1436,6 @@ 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 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(", ")}`);
@@ -1314,7 +1491,7 @@ ${cleared.size}\uAC74 \uBAA8\uB450 \uC774\uBBF8 \uD574\uC18C\uB41C \uC0C1\uD0DC\
           process.exitCode = 1;
           return;
         }
-        const shouldProceed = await confirm2({
+        const shouldProceed = await confirm3({
           message: `${pending.length}\uAC74\uC758 \uCDA9\uB3CC\uC744 '${strategy}' \uC804\uB7B5\uC73C\uB85C \uC77C\uAD04 \uD574\uACB0\uD560\uAE4C\uC694?`
         });
         if (!shouldProceed) return;
@@ -1441,7 +1618,14 @@ var watchCommand = new Command10("watch").description("\uD30C\uC77C \uBCC0\uACBD
   const stateDb = StateDB10.open(configManager.dbPath);
   const client = NotionClient10.fromConfig(config);
   const vaultFs = await openVaultFs(cwd, config.paths);
-  const orchestrator = new SyncOrchestrator9(config, stateDb, client, vaultFs);
+  const orchestrator = new SyncOrchestrator9(
+    config,
+    stateDb,
+    client,
+    vaultFs,
+    void 0,
+    await outsideVault(cwd, config.paths)
+  );
   const service = new WatchSyncService(cwd, orchestrator, {
     debounceMs,
     onFileChange: (event, path) => {
@@ -1682,7 +1866,7 @@ function scheduleForcedExit(proc, schedule = setTimeout) {
 var requireJson = createRequire(import.meta.url);
 var { version } = requireJson("../package.json");
 var program = new Command13();
-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.name("im-nobsidian").description("Im-Nobsidian: Obsidian \u2194 Notion \uC591\uBC29\uD5A5 \uB3D9\uAE30\uD654 CLI").version(version).option("--verbose", "\uC5D4\uC9C4\uC758 \uC815\uBCF4 \xB7 \uB514\uBC84\uADF8 \uB85C\uADF8\uB3C4 \uCD9C\uB825").option("--quiet", "\uACBD\uACE0 \uB85C\uADF8\uB97C \uC228\uAE30\uACE0 \uC624\uB958 \uB85C\uADF8\uB9CC \uCD9C\uB825").hook("preAction", () => applyLogLevel(logLevelOf(program.opts())));
 program.addCommand(initCommand);
 program.addCommand(pushCommand);
 program.addCommand(pullCommand);
@@ -1700,7 +1884,7 @@ program.parseAsync().then(
     scheduleForcedExit(process);
   },
   (error) => {
-    reportStateDbFailure(error, process);
+    reportUserFailure(error, process);
     scheduleForcedExit(process);
   }
 );