vibe-config-sync 0.2.3 → 0.3.0

package/README.md

@@ -21,6 +21,7 @@ When using AI coding tools on multiple machines, configurations like skills, com
 | `agents/` | Agent definitions |
 | `plugins/installed_plugins.json` | Plugin registry (machine paths stripped) |
 | `plugins/known_marketplaces.json` | Plugin marketplace sources (machine paths stripped) |
+| `mcp-servers.json` | MCP server configs (extracted from `~/.claude.json`) |
 
 **Not synced** (machine-specific / ephemeral / large): `plugins/cache/`, `projects/`, `telemetry/`, `session-env/`, `plans/`, `todos/`, `debug/`, `history.jsonl`, etc.
 
@@ -82,11 +83,11 @@ vibe-sync pull
 
 ## How It Works
 
-- **Export** copies config files into `~/.vibe-sync/data/`, stripping machine-specific paths from plugin JSON files. Skills that are symlinks are resolved and their actual contents are copied.
+- **Export** copies config files into `~/.vibe-sync/data/`, stripping machine-specific paths from plugin JSON files. Skills that are symlinks are resolved and their actual contents are copied. MCP server configurations are extracted from `~/.claude.json` and saved as `mcp-servers.json` (prompts for confirmation if `env` fields containing potential secrets are detected).
 
-- **Import** restores files from `~/.vibe-sync/data/` to `~/.claude/`, validating JSON structure before overwriting. Plugin JSON files are used as a manifest only (never copied directly) — the `claude` CLI installs plugins and writes correct registry files with local paths. Already-installed plugins are detected and skipped.
+- **Import** restores files from `~/.vibe-sync/data/` to `~/.claude/`, validating JSON structure before overwriting. Plugin JSON files are used as a manifest only (never copied directly) — the `claude` CLI installs plugins and writes correct registry files with local paths. Already-installed plugins are detected and skipped. MCP servers are merged into `~/.claude.json` — only new servers are added; existing servers are never overwritten.
 
-- **Backup** is created automatically at `~/.vibe-sync/backups/claude/<timestamp>/` before every import. Use `vibe-sync restore` to list or recover from backups.
+- **Backup** is created automatically at `~/.vibe-sync/backups/claude/<timestamp>/` before every import. Both `~/.claude/` contents and `~/.claude.json` are backed up. Use `vibe-sync restore` to list or recover from backups.
 
 ## Sync Strategy
 
@@ -118,6 +119,12 @@ In short: new content is added, existing content is overwritten, but nothing is
 
 Plugin JSON files (`installed_plugins.json`, `known_marketplaces.json`) are exported with machine-specific paths stripped. On import, they are **not** copied to `~/.claude/plugins/` — instead they serve as a manifest. The `claude` CLI is invoked to install each plugin, and it writes correct registry files with local paths as a side effect. Already-installed plugins (detected by `installPath`) are skipped to avoid redundant network operations.
 
+### MCP Servers
+
+MCP server configurations live in `~/.claude.json` under the `mcpServers` key. On export, this section is extracted and saved as `mcp-servers.json` in the sync directory. If any server config contains `env` fields (which may hold secrets like API keys), the user is prompted before exporting.
+
+On import, MCP servers are **additive only** — new servers from the sync repo are added to `~/.claude.json`, but existing servers with the same name are never overwritten. This preserves any machine-specific customizations (e.g., local paths, environment variables).
+
 ### What This Means in Practice
 
 - If both machines modify different configs and then sync, the machine that runs `import` last will lose its local changes (a timestamped backup exists at `~/.vibe-sync/backups/claude/` for manual recovery)
@@ -129,6 +136,7 @@ Plugin JSON files (`installed_plugins.json`, `known_marketplaces.json`) are expo
 | Variable | Description | Default |
 |----------|-------------|---------|
 | `CLAUDE_HOME` | Override Claude config directory | `~/.claude` |
+| `CLAUDE_JSON` | Override Claude global config file (MCP servers) | `~/.claude.json` |
 
 ## License
 

package/README.zh-CN.md

@@ -21,6 +21,7 @@
 | `agents/` | 代理定义 |
 | `plugins/installed_plugins.json` | 插件注册表（已剥离机器路径） |
 | `plugins/known_marketplaces.json` | 插件市场来源（已剥离机器路径） |
+| `mcp-servers.json` | MCP 服务器配置（从 `~/.claude.json` 提取） |
 
 **不同步**（机器特定 / 临时 / 大文件）：`plugins/cache/`、`projects/`、`telemetry/`、`session-env/`、`plans/`、`todos/`、`debug/`、`history.jsonl` 等。
 
@@ -82,11 +83,11 @@ vibe-sync pull
 
 ## 工作原理
 
-- **导出**：将配置文件复制到 `~/.vibe-sync/data/`，同时从插件 JSON 文件中剥离机器特定路径。符号链接的技能会被解析并复制其实际内容。
+- **导出**：将配置文件复制到 `~/.vibe-sync/data/`，同时从插件 JSON 文件中剥离机器特定路径。符号链接的技能会被解析并复制其实际内容。MCP 服务器配置从 `~/.claude.json` 中提取并保存为 `mcp-servers.json`（如果检测到包含潜在密钥的 `env` 字段，会提示用户确认）。
 
-- **导入**：从 `~/.vibe-sync/data/` 恢复文件到 `~/.claude/`，在覆盖前验证 JSON 结构。插件 JSON 文件仅作为清单使用（不会直接复制）—— `claude` CLI 负责安装插件并写入包含本地路径的正确注册文件。已安装的插件会被检测并跳过。
+- **导入**：从 `~/.vibe-sync/data/` 恢复文件到 `~/.claude/`，在覆盖前验证 JSON 结构。插件 JSON 文件仅作为清单使用（不会直接复制）—— `claude` CLI 负责安装插件并写入包含本地路径的正确注册文件。已安装的插件会被检测并跳过。MCP 服务器以增量方式合并到 `~/.claude.json`——仅添加新服务器，已存在的服务器不会被覆盖。
 
-- **备份**：每次导入前自动在 `~/.vibe-sync/backups/claude/<timestamp>/` 创建备份。使用 `vibe-sync restore` 列出或恢复备份。
+- **备份**：每次导入前自动在 `~/.vibe-sync/backups/claude/<timestamp>/` 创建备份，同时备份 `~/.claude/` 内容和 `~/.claude.json`。使用 `vibe-sync restore` 列出或恢复备份。
 
 ## 同步策略
 
@@ -118,6 +119,12 @@ vibe-sync pull
 
 插件 JSON 文件（`installed_plugins.json`、`known_marketplaces.json`）在导出时会剥离机器特定路径。导入时**不会**复制到 `~/.claude/plugins/`——而是作为清单使用。`claude` CLI 被调用来安装每个插件，并在安装过程中写入包含本地路径的正确注册文件。已安装的插件（通过 `installPath` 检测）会被跳过，以避免冗余的网络操作。
 
+### MCP 服务器
+
+MCP 服务器配置存储在 `~/.claude.json` 的 `mcpServers` 键下。导出时，该部分被提取并保存为同步目录中的 `mcp-servers.json`。如果任何服务器配置包含 `env` 字段（可能包含 API 密钥等密钥），导出前会提示用户确认。
+
+导入时，MCP 服务器采用**仅增量**策略——同步仓库中的新服务器会被添加到 `~/.claude.json`，但同名的已有服务器不会被覆盖。这保留了机器特定的自定义配置（如本地路径、环境变量）。
+
 ### 实际影响
 
 - 如果两台机器修改了不同的配置然后同步，最后执行 `import` 的机器会丢失其本地更改（可在 `~/.vibe-sync/backups/claude/` 找到带时间戳的备份进行手动恢复）
@@ -129,6 +136,7 @@ vibe-sync pull
 | 变量 | 说明 | 默认值 |
 |------|------|--------|
 | `CLAUDE_HOME` | 覆盖 Claude 配置目录 | `~/.claude` |
+| `CLAUDE_JSON` | 覆盖 Claude 全局配置文件（MCP 服务器） | `~/.claude.json` |
 
 ## 许可证
 

package/dist/index.js

@@ -8,6 +8,7 @@ import fs from "fs-extra";
 import os from "os";
 import path from "path";
 var CLAUDE_HOME = process.env.CLAUDE_HOME ?? path.join(os.homedir(), ".claude");
+var CLAUDE_JSON = process.env.CLAUDE_JSON ?? path.join(os.homedir(), ".claude.json");
 var SYNC_DIR = path.join(os.homedir(), ".vibe-sync");
 var BACKUP_BASE = path.join(SYNC_DIR, "backups", "claude");
 function getConfigDir() {
@@ -19,10 +20,12 @@ function isInitialized() {
 var SYNC_FILES = ["settings.json", "CLAUDE.md"];
 var SYNC_DIRS = ["commands", "agents"];
 var PLUGIN_FILES = ["installed_plugins.json", "known_marketplaces.json"];
+var MCP_SYNC_FILE = "mcp-servers.json";
 
 // src/commands/export.ts
 import fs4 from "fs-extra";
 import path4 from "path";
+import readline from "readline/promises";
 
 // src/core/logger.ts
 import pc from "picocolors";
@@ -64,8 +67,11 @@ function readJsonSafe(filePath) {
     return fs2.readJsonSync(filePath);
   } catch (err) {
     const code = err.code;
-    if (code !== "ENOENT") {
-      logWarn(`Failed to parse ${filePath}: ${err.message}`);
+    if (code === "ENOENT") return null;
+    if (err instanceof SyntaxError) {
+      logWarn(`Failed to parse JSON ${filePath}: ${err.message}`);
+    } else {
+      logWarn(`Failed to read ${filePath}: ${err.message}`);
     }
     return null;
   }
@@ -76,6 +82,11 @@ function writeJsonSafe(filePath, data) {
 }
 
 // src/core/sanitize.ts
+function mcpServersHaveEnv(servers) {
+  return Object.values(servers).some(
+    (config) => typeof config === "object" && config !== null && "env" in config
+  );
+}
 function sanitizePlugins(data) {
   const result = structuredClone(data);
   for (const entries of Object.values(result.plugins ?? {})) {
@@ -134,14 +145,34 @@ function importSkills(srcDir, destDir) {
     if (entry.isDirectory()) {
       const src = path3.join(srcDir, entry.name);
       const dest = path3.join(destDir, entry.name);
-      fs3.copySync(src, dest, { overwrite: true });
+      copyDirClean(src, dest);
       logInfo(`Imported skill: ${entry.name}`);
     }
   }
 }
 
 // src/commands/export.ts
-function cmdExport() {
+async function confirmMcpExport() {
+  const rl = readline.createInterface({
+    input: process.stdin,
+    output: process.stdout
+  });
+  try {
+    const answer = await rl.question(
+      '[WARN] MCP server configs contain "env" fields that may include secrets (API keys, tokens).\n       Export anyway? (y/N): '
+    );
+    return answer.trim().toLowerCase() === "y";
+  } finally {
+    rl.close();
+  }
+}
+async function cmdExport() {
+  if (!fs4.existsSync(CLAUDE_HOME)) {
+    throw new Error(
+      `Claude config directory not found: ${CLAUDE_HOME}
+Make sure Claude Code has been run at least once.`
+    );
+  }
   const configDir = getConfigDir();
   const pluginsDir = path4.join(configDir, "plugins");
   fs4.ensureDirSync(pluginsDir);
@@ -187,6 +218,21 @@ function cmdExport() {
     );
     logInfo("Exported: plugins/known_marketplaces.json (sanitized)");
   }
+  const claudeJson = readJsonSafe(CLAUDE_JSON);
+  const mcpServers = claudeJson?.mcpServers;
+  if (typeof mcpServers === "object" && mcpServers !== null) {
+    const servers = mcpServers;
+    let shouldExport = true;
+    if (mcpServersHaveEnv(servers)) {
+      shouldExport = await confirmMcpExport();
+    }
+    if (shouldExport) {
+      writeJsonSafe(path4.join(configDir, MCP_SYNC_FILE), servers);
+      logInfo(`Exported: ${MCP_SYNC_FILE} (from ~/.claude.json)`);
+    } else {
+      logWarn(`Skipped: ${MCP_SYNC_FILE} (user declined due to env secrets)`);
+    }
+  }
   logOk("Export complete");
 }
 
@@ -218,22 +264,24 @@ function backupExisting() {
     fs5.copySync(skillsDir, path5.join(backupDir, "skills"));
   }
   const pluginsDir = path5.join(CLAUDE_HOME, "plugins");
+  fs5.ensureDirSync(path5.join(backupDir, "plugins"));
   for (const file of PLUGIN_FILES) {
     const src = path5.join(pluginsDir, file);
     if (fs5.existsSync(src)) {
-      fs5.ensureDirSync(path5.join(backupDir, "plugins"));
       fs5.copySync(src, path5.join(backupDir, "plugins", file));
     }
   }
+  if (fs5.existsSync(CLAUDE_JSON)) {
+    fs5.copySync(CLAUDE_JSON, path5.join(backupDir, ".claude.json"));
+  }
   logOk(`Backup created: ${backupDir}`);
-  return backupDir;
 }
 function listBackups() {
   if (!fs5.existsSync(BACKUP_BASE)) return [];
   return fs5.readdirSync(BACKUP_BASE, { withFileTypes: true }).filter((entry) => entry.isDirectory()).map((entry) => entry.name).sort().reverse();
 }
 function restoreFromBackup(backupName) {
-  if (!backupName || backupName.includes("/") || backupName.includes("\\") || backupName.includes("..")) {
+  if (!backupName || backupName.includes("/") || backupName.includes("\\")) {
     throw new Error(`Invalid backup name: ${backupName}`);
   }
   const backupDir = path5.join(BACKUP_BASE, backupName);
@@ -275,11 +323,16 @@ function restoreFromBackup(backupName) {
       }
     }
   }
+  const claudeJsonSrc = path5.join(backupDir, ".claude.json");
+  if (fs5.existsSync(claudeJsonSrc)) {
+    fs5.copySync(claudeJsonSrc, CLAUDE_JSON);
+    logInfo("Restored: .claude.json");
+  }
   logOk(`Restored from backup: ${backupName}`);
 }
 
 // src/core/plugins.ts
-import { execFileSync, spawnSync } from "child_process";
+import { spawnSync } from "child_process";
 function isNonNullObject(value) {
   return typeof value === "object" && value !== null && !Array.isArray(value);
 }
@@ -299,17 +352,12 @@ function execClaude(args) {
   return result.status === 0;
 }
 function isClaudeAvailable() {
-  try {
-    execFileSync("claude", ["--version"], { stdio: "pipe", timeout: 5e3, shell: true });
-    return true;
-  } catch {
-    return false;
-  }
+  const result = spawnSync("claude", ["--version"], { stdio: "pipe", timeout: 5e3, shell: true });
+  return result.status === 0;
 }
 function reinstallPlugins(marketplacesFile, pluginsFile, settingsFile, existingState) {
   if (!isClaudeAvailable()) {
-    logError("claude CLI not found. Cannot reinstall plugins.");
-    return;
+    throw new Error("claude CLI not found. Cannot reinstall plugins.");
   }
   logInfo("Phase 1: Adding plugin marketplaces...");
   const marketplaces = readJsonSafe(marketplacesFile);
@@ -417,24 +465,19 @@ function validatePluginsJson(filePath) {
   }
   return ok(data);
 }
-function validateMarketplacesJson(filePath) {
-  return validateJsonFile(filePath);
-}
 
 // src/commands/import.ts
-function cmdImport(options = {}) {
-  const configDir = getConfigDir();
-  if (!fs6.existsSync(configDir)) {
-    throw new Error(
-      `Config directory not found: ${configDir}
-Run "vibe-sync export" first or "vibe-sync pull"`
-    );
-  }
-  const dryRun = !!options.dryRun;
-  if (dryRun) logInfo("Dry run - no changes will be made\n");
-  if (!dryRun) backupExisting();
+function validateSyncFile(file, src) {
+  if (file === "settings.json") return validateSettingsJson(src);
+  return validateJsonFile(src);
+}
+function validatePluginFile(file, src) {
+  if (file === "known_marketplaces.json") return validateJsonFile(src);
+  return validatePluginsJson(src);
+}
+function captureExistingPluginState() {
   const pluginsDest = path6.join(CLAUDE_HOME, "plugins");
-  const existingState = {
+  return {
     marketplaces: readJsonSafe(
       path6.join(pluginsDest, "known_marketplaces.json")
     ),
@@ -445,39 +488,48 @@ Run "vibe-sync export" first or "vibe-sync pull"`
       path6.join(CLAUDE_HOME, "settings.json")
     )
   };
+}
+function importFile(file, src, stripPluginSettings, dryRun) {
+  const dest = path6.join(CLAUDE_HOME, file);
+  const exists = fs6.existsSync(dest);
+  if (dryRun) {
+    const suffix2 = stripPluginSettings ? " (without enabledPlugins)" : "";
+    logInfo(`Would import: ${file}${exists ? " (overwrite)" : " (new)"}${suffix2}`);
+    return;
+  }
+  fs6.ensureDirSync(path6.dirname(dest));
+  if (stripPluginSettings) {
+    const data = readJsonSafe(src);
+    if (!data) {
+      logWarn(`Skipping ${file}: invalid JSON, cannot strip enabledPlugins`);
+      return;
+    }
+    delete data.enabledPlugins;
+    fs6.writeJsonSync(dest, data, { spaces: 2 });
+  } else {
+    fs6.copySync(src, dest);
+  }
+  const suffix = stripPluginSettings ? " (stripped enabledPlugins)" : "";
+  logInfo(`Imported: ${file}${suffix}`);
+}
+function importSyncFiles(configDir, options) {
+  const dryRun = !!options.dryRun;
   for (const file of SYNC_FILES) {
     const src = path6.join(configDir, file);
     if (!fs6.existsSync(src)) continue;
     if (file.endsWith(".json")) {
-      const result = file === "settings.json" ? validateSettingsJson(src) : validateJsonFile(src);
+      const result = validateSyncFile(file, src);
       if (!result.valid) {
-        if (dryRun) logWarn(`  INVALID: ${result.errors.join(", ")}`);
-        else logWarn(`Skipping ${file}: ${result.errors.join(", ")}`);
+        logWarn(dryRun ? `  INVALID: ${result.errors.join(", ")}` : `Skipping ${file}: ${result.errors.join(", ")}`);
         continue;
       }
       if (dryRun) logOk(`  Validated: ${file}`);
     }
-    const dest = path6.join(CLAUDE_HOME, file);
-    const exists = fs6.existsSync(dest);
     const stripPluginSettings = file === "settings.json" && !options.reinstallPlugins;
-    if (dryRun) {
-      logInfo(`Would import: ${file}${exists ? " (overwrite)" : " (new)"}${stripPluginSettings ? " (without enabledPlugins)" : ""}`);
-    } else {
-      fs6.ensureDirSync(path6.dirname(dest));
-      if (stripPluginSettings) {
-        const data = readJsonSafe(src);
-        if (data) {
-          delete data.enabledPlugins;
-          fs6.writeJsonSync(dest, data, { spaces: 2 });
-        } else {
-          fs6.copySync(src, dest);
-        }
-      } else {
-        fs6.copySync(src, dest);
-      }
-      logInfo(`Imported: ${file}${stripPluginSettings ? " (stripped enabledPlugins)" : ""}`);
-    }
+    importFile(file, src, stripPluginSettings, dryRun);
   }
+}
+function importSyncDirs(configDir, dryRun) {
   for (const dir of SYNC_DIRS) {
     const src = path6.join(configDir, dir);
     if (!fs6.existsSync(src)) continue;
@@ -489,6 +541,8 @@ Run "vibe-sync export" first or "vibe-sync pull"`
       logInfo(`Imported: ${dir}/`);
     }
   }
+}
+function importSyncSkills(configDir, dryRun) {
   const skillsSrc = path6.join(configDir, "skills");
   if (dryRun && fs6.existsSync(skillsSrc)) {
     const entries = fs6.readdirSync(skillsSrc, { withFileTypes: true });
@@ -498,50 +552,113 @@ Run "vibe-sync export" first or "vibe-sync pull"`
   } else if (!dryRun) {
     importSkills(skillsSrc, path6.join(CLAUDE_HOME, "skills"));
   }
+}
+function readLocalMcpServers() {
+  const json = readJsonSafe(CLAUDE_JSON) ?? {};
+  const mcpServers = json.mcpServers;
+  const servers = typeof mcpServers === "object" && mcpServers !== null ? mcpServers : {};
+  return { json, servers };
+}
+function importMcpServers(configDir, dryRun) {
+  const src = path6.join(configDir, MCP_SYNC_FILE);
+  if (!fs6.existsSync(src)) return;
+  const result = validateJsonFile(src);
+  if (!result.valid) {
+    logWarn(dryRun ? `  INVALID: ${result.errors.join(", ")}` : `Skipping ${MCP_SYNC_FILE}: ${result.errors.join(", ")}`);
+    return;
+  }
+  if (dryRun) logOk(`  Validated: ${MCP_SYNC_FILE}`);
+  const syncedServers = readJsonSafe(src);
+  if (!syncedServers) return;
+  const { json: existing, servers: currentServers } = readLocalMcpServers();
+  const syncedNames = Object.keys(syncedServers);
+  const newNames = syncedNames.filter((n) => !(n in currentServers));
+  if (dryRun) {
+    const skipNames = syncedNames.filter((n) => n in currentServers);
+    if (newNames.length > 0) logInfo(`Would import MCP servers: ${newNames.join(", ")}`);
+    if (skipNames.length > 0) logWarn(`Would skip (already exist): ${skipNames.join(", ")}`);
+    if (newNames.length === 0) logInfo("No new MCP servers to import");
+    return;
+  }
+  if (newNames.length === 0) {
+    logInfo("No new MCP servers to import (all already exist locally)");
+    return;
+  }
+  for (const name of syncedNames) {
+    if (name in currentServers) {
+      logWarn(`MCP server already exists locally, skipping: ${name}`);
+    }
+  }
+  const newServers = Object.fromEntries(
+    newNames.map((name) => [name, syncedServers[name]])
+  );
+  existing.mcpServers = { ...currentServers, ...newServers };
+  fs6.writeJsonSync(CLAUDE_JSON, existing, { spaces: 2 });
+  logInfo(`Imported: ${MCP_SYNC_FILE} \u2192 ~/.claude.json (added ${newNames.length} new server(s))`);
+}
+function syncPlugins(configDir, existingState, dryRun) {
   const pluginsSrc = path6.join(configDir, "plugins");
-  if (options.reinstallPlugins) {
-    const hasManifest = PLUGIN_FILES.some(
-      (f) => fs6.existsSync(path6.join(pluginsSrc, f))
-    );
-    if (!hasManifest) {
-      logInfo("No plugin manifest files found in sync directory");
-    } else {
-      const pluginValidators = {
-        "installed_plugins.json": validatePluginsJson,
-        "known_marketplaces.json": validateMarketplacesJson
-      };
-      let validationPassed = true;
-      for (const file of PLUGIN_FILES) {
-        const src = path6.join(pluginsSrc, file);
-        if (!fs6.existsSync(src)) continue;
-        const result = pluginValidators[file](src);
-        if (!result.valid) {
-          logWarn(`${dryRun ? "  INVALID" : `Invalid plugins/${file}`}: ${result.errors.join(", ")}`);
-          validationPassed = false;
-        } else if (dryRun) {
-          logOk(`  Validated: plugins/${file}`);
-        }
-      }
-      if (!validationPassed) {
-        logWarn("Skipping plugin reinstallation due to validation errors");
-      } else if (dryRun) {
-        logInfo("Would reinstall plugins via claude CLI");
-      } else {
-        reinstallPlugins(
-          path6.join(pluginsSrc, "known_marketplaces.json"),
-          path6.join(pluginsSrc, "installed_plugins.json"),
-          path6.join(CLAUDE_HOME, "settings.json"),
-          existingState
-        );
-      }
+  const hasManifest = PLUGIN_FILES.some(
+    (f) => fs6.existsSync(path6.join(pluginsSrc, f))
+  );
+  if (!hasManifest) {
+    logInfo("No plugin manifest files found in sync directory");
+    return;
+  }
+  let validationPassed = true;
+  for (const file of PLUGIN_FILES) {
+    const src = path6.join(pluginsSrc, file);
+    if (!fs6.existsSync(src)) continue;
+    const result = validatePluginFile(file, src);
+    if (!result.valid) {
+      logWarn(dryRun ? `  INVALID: ${result.errors.join(", ")}` : `Invalid plugins/${file}: ${result.errors.join(", ")}`);
+      validationPassed = false;
+    } else if (dryRun) {
+      logOk(`  Validated: plugins/${file}`);
     }
+  }
+  if (!validationPassed) {
+    logWarn("Skipping plugin reinstallation due to validation errors");
+    return;
+  }
+  if (dryRun) {
+    logInfo("Would reinstall plugins via claude CLI");
+    return;
+  }
+  reinstallPlugins(
+    path6.join(pluginsSrc, "known_marketplaces.json"),
+    path6.join(pluginsSrc, "installed_plugins.json"),
+    path6.join(CLAUDE_HOME, "settings.json"),
+    existingState
+  );
+}
+function cmdImport(options = {}) {
+  const configDir = getConfigDir();
+  if (!fs6.existsSync(configDir)) {
+    throw new Error(
+      `Config directory not found: ${configDir}
+Run "vibe-sync export" first or "vibe-sync pull"`
+    );
+  }
+  const dryRun = !!options.dryRun;
+  if (dryRun) logInfo("Dry run - no changes will be made\n");
+  if (!dryRun) backupExisting();
+  const existingState = captureExistingPluginState();
+  importSyncFiles(configDir, options);
+  importSyncDirs(configDir, dryRun);
+  importSyncSkills(configDir, dryRun);
+  importMcpServers(configDir, dryRun);
+  if (options.reinstallPlugins) {
+    syncPlugins(configDir, existingState, dryRun);
   } else {
-    logInfo("Skipping plugin sync (omit --no-plugins to enable)");
+    logInfo("Skipping plugin sync (remove --no-plugins flag to enable)");
   }
   if (!dryRun) logOk("Import complete");
 }
 
 // src/commands/status.ts
+import fs8 from "fs-extra";
+import os2 from "os";
 import path8 from "path";
 
 // src/core/diff.ts
@@ -552,9 +669,6 @@ import pc2 from "picocolors";
 function readNormalized(filePath) {
   return fs7.readFileSync(filePath, "utf-8").replace(/\r\n/g, "\n");
 }
-function filesEqual(a, b) {
-  return readNormalized(a) === readNormalized(b);
-}
 function dirsEqual(a, b) {
   const aEntries = fs7.readdirSync(a).sort();
   const bEntries = fs7.readdirSync(b).sort();
@@ -563,36 +677,37 @@ function dirsEqual(a, b) {
     if (aEntries[i] !== bEntries[i]) return false;
     const aPath = path7.join(a, aEntries[i]);
     const bPath = path7.join(b, bEntries[i]);
-    const aStat = fs7.statSync(aPath);
-    const bStat = fs7.statSync(bPath);
-    if (aStat.isDirectory() !== bStat.isDirectory()) return false;
-    const equal = aStat.isDirectory() ? dirsEqual(aPath, bPath) : filesEqual(aPath, bPath);
-    if (!equal) return false;
+    try {
+      const aStat = fs7.statSync(aPath);
+      const bStat = fs7.statSync(bPath);
+      if (aStat.isDirectory() !== bStat.isDirectory()) return false;
+      const equal = aStat.isDirectory() ? dirsEqual(aPath, bPath) : readNormalized(aPath) === readNormalized(bPath);
+      if (!equal) return false;
+    } catch {
+      return false;
+    }
   }
   return true;
 }
-function colorDiff(patch) {
-  return patch.split("\n").map((line) => {
-    if (line.startsWith("+")) return pc2.green(line);
-    if (line.startsWith("-")) return pc2.red(line);
-    if (line.startsWith("@@")) return pc2.cyan(line);
-    return line;
-  }).join("\n");
+function colorDiffLine(line) {
+  if (line.startsWith("@@")) return pc2.cyan(line);
+  if (line.startsWith("+")) return pc2.green(line);
+  if (line.startsWith("-")) return pc2.red(line);
+  return line;
 }
 function showDiff(localPath, repoPath, label) {
-  if (!fs7.existsSync(localPath) && !fs7.existsSync(repoPath)) {
-    return false;
-  }
-  if (!fs7.existsSync(localPath)) {
+  const localExists = fs7.existsSync(localPath);
+  const repoExists = fs7.existsSync(repoPath);
+  if (!localExists && !repoExists) return false;
+  if (!localExists) {
     console.log(pc2.yellow(`  ${label}: exists in repo but not locally`));
     return true;
   }
-  if (!fs7.existsSync(repoPath)) {
+  if (!repoExists) {
     console.log(pc2.yellow(`  ${label}: exists locally but not in repo`));
     return true;
   }
-  const isDir = fs7.statSync(localPath).isDirectory();
-  if (isDir) {
+  if (fs7.statSync(localPath).isDirectory()) {
     if (dirsEqual(localPath, repoPath)) return false;
     console.log(pc2.yellow(`  ${label}: differs`));
     return true;
@@ -607,7 +722,7 @@ function showDiff(localPath, repoPath, label) {
     localContent,
     repoContent
   );
-  console.log(colorDiff(patch));
+  console.log(patch.split("\n").map(colorDiffLine).join("\n"));
   return true;
 }
 
@@ -634,13 +749,30 @@ function cmdStatus() {
   if (showDiff(localSkills, repoSkills, "skills/")) {
     hasDiff = true;
   }
-  for (const file of ["installed_plugins.json", "known_marketplaces.json"]) {
+  for (const file of PLUGIN_FILES) {
     const local = path8.join(CLAUDE_HOME, "plugins", file);
     const repo = path8.join(configDir, "plugins", file);
     if (showDiff(local, repo, `plugins/${file}`)) {
       hasDiff = true;
     }
   }
+  const repoMcp = path8.join(configDir, MCP_SYNC_FILE);
+  const claudeJson = readJsonSafe(CLAUDE_JSON);
+  const localMcp = typeof claudeJson?.mcpServers === "object" && claudeJson.mcpServers !== null ? claudeJson.mcpServers : void 0;
+  if (localMcp || fs8.existsSync(repoMcp)) {
+    const tmpFile = path8.join(os2.tmpdir(), `vibe-sync-mcp-${Date.now()}.json`);
+    try {
+      if (localMcp) {
+        fs8.writeJsonSync(tmpFile, localMcp, { spaces: 2 });
+      }
+      const localPath = localMcp ? tmpFile : "";
+      if (showDiff(localPath, repoMcp, MCP_SYNC_FILE)) {
+        hasDiff = true;
+      }
+    } finally {
+      fs8.removeSync(tmpFile);
+    }
+  }
   if (!hasDiff) {
     logOk("No differences found");
   }
@@ -666,43 +798,85 @@ async function hasRemote(git) {
     return false;
   }
 }
+function setUpstreamArgs(remoteBranch, localBranch) {
+  return ["--set-upstream-to=origin/" + remoteBranch, localBranch];
+}
 async function commitAndPush(git) {
   await ensureGitRepo(git);
   await git.add("-A");
   const status = await git.status();
-  if (status.isClean()) {
-    logInfo("No changes to commit");
-  } else {
+  const hasChanges = !status.isClean();
+  if (hasChanges) {
     const timestamp = (/* @__PURE__ */ new Date()).toISOString().slice(0, 19).replace("T", "_");
     const msg = `sync: update claude configs ${timestamp}`;
     await git.commit(msg);
     logOk(`Committed: ${msg}`);
-  }
-  if (await hasRemote(git)) {
-    const branch = (await git.branchLocal()).current || "main";
-    await git.push(["-u", "origin", branch]);
-    logOk("Pushed to remote");
   } else {
+    logInfo("No changes to commit");
+  }
+  if (!await hasRemote(git)) {
     logWarn("No remote configured. Run: git remote add origin <url>");
+    return hasChanges;
+  }
+  const branch = (await git.branchLocal()).current || "main";
+  try {
+    await git.push(["-u", "origin", branch]);
+  } catch {
+    logInfo("Push rejected, pulling remote changes first");
+    await pullFromRemote(git);
+    await git.push(["-u", "origin", branch]);
+  }
+  logOk("Pushed to remote");
+  return hasChanges;
+}
+async function detectRemoteBranch(git) {
+  try {
+    const remote = await git.remote(["show", "origin"]);
+    if (remote) {
+      const match = remote.match(/HEAD branch:\s*(\S+)/);
+      if (match) return match[1];
+    }
+  } catch {
   }
-  return !status.isClean();
+  try {
+    const refs = await git.listRemote(["--heads", "origin"]);
+    if (refs.includes("refs/heads/main")) return "main";
+    if (refs.includes("refs/heads/master")) return "master";
+  } catch {
+  }
+  return "main";
 }
 async function pullFromRemote(git) {
   if (!await hasRemote(git)) {
     throw new Error("No remote configured. Run: git remote add origin <url>");
   }
-  const branch = (await git.branchLocal()).current || "main";
+  const localBranch = (await git.branchLocal()).current;
+  const remoteBranch = await detectRemoteBranch(git);
+  const branch = localBranch || remoteBranch;
   try {
     await git.pull();
   } catch {
     try {
-      await git.pull("origin", branch);
-      await git.branch(["--set-upstream-to=origin/" + branch, branch]);
+      await git.pull("origin", remoteBranch);
+      await git.branch(setUpstreamArgs(remoteBranch, branch));
+    } catch {
+      logWarn("Merge conflict detected. Stashing local changes before resetting to remote version.");
+      await git.fetch("origin", remoteBranch);
+      try {
+        await git.stash(["push", "-m", `vibe-sync: pre-reset backup ${(/* @__PURE__ */ new Date()).toISOString()}`]);
+        logInfo('Local changes stashed. Use "git stash pop" in ~/.vibe-sync to recover if needed.');
+      } catch {
+      }
+      await git.reset(["--hard", `origin/${remoteBranch}`]);
+      await git.clean("f", ["-d"]);
+      await git.branch(setUpstreamArgs(remoteBranch, branch));
+    }
+  }
+  if (localBranch && localBranch !== remoteBranch) {
+    try {
+      await git.branch(["-m", localBranch, remoteBranch]);
+      await git.branch(setUpstreamArgs(remoteBranch, remoteBranch));
     } catch {
-      logWarn("Merge conflict detected, resetting to remote version");
-      await git.fetch("origin", branch);
-      await git.reset(["--hard", `origin/${branch}`]);
-      await git.branch(["--set-upstream-to=origin/" + branch, branch]);
     }
   }
   logOk("Pulled from remote");
@@ -710,7 +884,7 @@ async function pullFromRemote(git) {
 
 // src/commands/push.ts
 async function cmdPush() {
-  cmdExport();
+  await cmdExport();
   const git = createGit(SYNC_DIR);
   await commitAndPush(git);
 }
@@ -719,7 +893,24 @@ async function cmdPush() {
 async function cmdPull(options = {}) {
   const git = createGit(SYNC_DIR);
   if (options.dryRun) {
-    logInfo("Dry run: skipping git pull");
+    if (await hasRemote(git)) {
+      await git.fetch();
+      const localHead = await git.revparse(["HEAD"]);
+      const remoteHead = await git.revparse(["FETCH_HEAD"]).catch(() => null);
+      if (remoteHead && localHead !== remoteHead) {
+        const summary = await git.diffSummary(["HEAD", "FETCH_HEAD"]);
+        logInfo(`Remote has ${summary.changed} changed file(s) ahead of local:`);
+        for (const file of summary.files) {
+          const ins = "insertions" in file ? file.insertions : 0;
+          const del = "deletions" in file ? file.deletions : 0;
+          logInfo(`  ${file.file} (+${ins} -${del})`);
+        }
+      } else {
+        logInfo("Remote is up to date with local");
+      }
+    } else {
+      logWarn("No remote configured, cannot fetch for preview");
+    }
   } else {
     await pullFromRemote(git);
   }
@@ -727,87 +918,77 @@ async function cmdPull(options = {}) {
 }
 
 // src/commands/init.ts
-import fs8 from "fs-extra";
+import fs9 from "fs-extra";
 import path9 from "path";
-import readline from "readline/promises";
+import readline2 from "readline/promises";
+var GIT_URL_PATTERN = /^(https?:\/\/|git@|ssh:\/\/|git:\/\/).+/;
 function createReadline() {
-  return readline.createInterface({
+  return readline2.createInterface({
     input: process.stdin,
     output: process.stdout
   });
 }
-async function cmdInit() {
-  if (isInitialized()) {
-    const git = createGit(SYNC_DIR);
-    const remotes = await git.getRemotes(true);
-    const origin = remotes.find((r) => r.name === "origin");
+async function promptUrl(rl, prompt) {
+  const url = await rl.question(prompt);
+  const trimmed = url.trim();
+  if (!trimmed) return null;
+  if (!GIT_URL_PATTERN.test(trimmed)) {
+    logError("Invalid Git URL format. Expected https://, git@, ssh://, or git:// URL");
+    return null;
+  }
+  return trimmed;
+}
+async function updateRemote() {
+  const git = createGit(SYNC_DIR);
+  const remotes = await git.getRemotes(true);
+  const origin = remotes.find((r) => r.name === "origin");
+  if (origin) {
+    logInfo(`Current remote: ${origin.refs.fetch}`);
+  } else {
+    logWarn("No remote configured");
+  }
+  const rl = createReadline();
+  try {
+    const url = await promptUrl(rl, "? New Git remote URL (leave empty to keep current): ");
+    if (!url) {
+      logInfo("Remote unchanged");
+      return;
+    }
     if (origin) {
-      logInfo(`Current remote: ${origin.refs.fetch}`);
+      await git.remote(["set-url", "origin", url]);
     } else {
-      logWarn("No remote configured");
-    }
-    const rl2 = createReadline();
-    try {
-      const url = await rl2.question("? New Git remote URL (leave empty to keep current): ");
-      const trimmedUrl = url.trim();
-      if (!trimmedUrl) {
-        logInfo("Remote unchanged");
-        return;
-      }
-      const gitUrlPattern = /^(https?:\/\/|git@|ssh:\/\/|git:\/\/).+/;
-      if (!gitUrlPattern.test(trimmedUrl)) {
-        logError("Invalid Git URL format. Expected https://, git@, ssh://, or git:// URL");
-        return;
-      }
-      if (origin) {
-        await git.remote(["set-url", "origin", trimmedUrl]);
-      } else {
-        await git.addRemote("origin", trimmedUrl);
-      }
-      logOk(`Remote updated: ${trimmedUrl}`);
-    } finally {
-      rl2.close();
+      await git.addRemote("origin", url);
     }
-    return;
+    logOk(`Remote updated: ${url}`);
+  } finally {
+    rl.close();
   }
+}
+async function freshInit() {
   console.log("");
   console.log("Welcome to vibe-sync! Let's set up config synchronization.");
   console.log("");
   const rl = createReadline();
   try {
-    const url = await rl.question("? Git remote URL: ");
-    const trimmedUrl = url.trim();
-    if (!trimmedUrl) {
+    const url = await promptUrl(rl, "? Git remote URL: ");
+    if (!url) {
       logError("URL cannot be empty");
       return;
     }
-    const gitUrlPattern = /^(https?:\/\/|git@|ssh:\/\/|git:\/\/).+/;
-    if (!gitUrlPattern.test(trimmedUrl)) {
-      logError("Invalid Git URL format. Expected https://, git@, ssh://, or git:// URL");
-      return;
-    }
-    fs8.ensureDirSync(SYNC_DIR);
+    fs9.ensureDirSync(SYNC_DIR);
     const git = createGit(SYNC_DIR);
     await git.init();
     logOk("Initialized git repository");
-    await git.addRemote("origin", trimmedUrl);
-    logOk(`Remote added: ${trimmedUrl}`);
+    await git.addRemote("origin", url);
+    logOk(`Remote added: ${url}`);
     try {
-      await git.pull("origin", "main");
-      await git.branch(["--set-upstream-to=origin/main", "main"]);
-      logOk("Pulled existing data from remote");
+      await pullFromRemote(git);
     } catch {
-      try {
-        await git.pull("origin", "master");
-        await git.branch(["--set-upstream-to=origin/master", "master"]);
-        logOk("Pulled existing data from remote");
-      } catch {
-        logInfo("No existing data on remote (new repository)");
-      }
+      logInfo("No existing data on remote (new repository)");
     }
     const gitignorePath = path9.join(SYNC_DIR, ".gitignore");
-    if (!fs8.existsSync(gitignorePath)) {
-      fs8.writeFileSync(gitignorePath, ".DS_Store\nThumbs.db\n");
+    if (!fs9.existsSync(gitignorePath)) {
+      fs9.writeFileSync(gitignorePath, ".DS_Store\nThumbs.db\n");
     }
     console.log("");
     logOk("Setup complete!");
@@ -820,13 +1001,19 @@ async function cmdInit() {
     rl.close();
   }
 }
+async function cmdInit() {
+  if (isInitialized()) {
+    await updateRemote();
+    return;
+  }
+  await freshInit();
+}
 
 // src/commands/restore.ts
 function cmdRestore(timestamp) {
   const backups = listBackups();
   if (backups.length === 0) {
-    logError('No backups found. Run "vibe-sync import" first to create a backup.');
-    return;
+    throw new Error('No backups found. Run "vibe-sync import" first to create a backup.');
   }
   if (!timestamp) {
     logInfo(`Available backups (${backups.length}):`);
@@ -840,15 +1027,14 @@ function cmdRestore(timestamp) {
     return;
   }
   if (!backups.includes(timestamp)) {
-    logError(`Backup not found: ${timestamp}`);
-    return;
+    throw new Error(`Backup not found: ${timestamp}`);
   }
   restoreFromBackup(timestamp);
 }
 
 // src/index.ts
 var program = new Command();
-program.name("vibe-sync").description("Sync AI coding tool configurations across machines via git").version("0.2.3").action(async () => {
+program.name("vibe-sync").description("Sync AI coding tool configurations across machines via git").version("0.3.0").action(async () => {
   if (!isInitialized()) {
     await cmdInit();
   } else {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vibe-config-sync",
-  "version": "0.2.3",
+  "version": "0.3.0",
   "description": "Cross-platform CLI tool to sync AI coding tool configurations across machines via git",
   "type": "module",
   "bin": {