claude-multi 0.4.2 → 0.4.4

package/CHANGELOG.md

@@ -5,6 +5,33 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## [0.4.3] - 2026-01-26
+
+### Added
+- **Broken Symlink Detection**: Automatically detect and fix broken symlinks
+  - New `isBrokenSymlink()` and `detectBrokenSymlinks()` functions
+  - Auto-fix broken symlinks when creating or updating instances
+  - Handles edge cases: broken symlinks, existing directories, incorrect symlink targets
+- **`fix-symlinks` Command**: Fix broken symlinks for existing instances
+  - Interactive instance selection with multi-select support
+  - `--all` flag to fix all instances at once
+  - Auto-fixes instances with auto-sync enabled, warns for manual mode
+  - Clear status indicators for broken symlinks vs. valid symlinks
+- **Interactive Re-sync**: Added "Re-sync symlinks" option to interactive mode menu
+  - Quick access to symlink diagnosis and repair from interactive UI
+- **Test Suite**: Comprehensive tests for symlink detection and fixing
+  - Tests for broken symlink detection
+  - Tests for valid symlink handling
+  - Tests for mixed scenarios (broken + valid symlinks)
+  - Error handling tests for non-existent paths
+
+### Fixed
+- Symlink creation now uses `lstatSync` for proper broken symlink detection
+- Previously, `existsSync()` returned `false` for broken symlinks, preventing detection
+- Now correctly identifies and repairs broken symlinks in all scenarios
+
+[0.4.3]: https://github.com/hmziqrs/claude-multi/compare/v0.4.2...v0.4.3
+
 ## [0.4.2] - 2026-01-26
 
 ### Fixed

package/dist/cli.js

@@ -7286,10 +7286,10 @@ import { homedir as homedir2 } from "os";
 import { join as join3 } from "path";
 
 // src/config.ts
-import { existsSync, mkdirSync, readdirSync, statSync, unlinkSync, readlinkSync, rmSync } from "fs";
+import { existsSync, mkdirSync, readdirSync, statSync, readlinkSync, rmSync, lstatSync } from "fs";
 import { readFile, writeFile, copyFile, mkdir, symlink } from "fs/promises";
 import { homedir } from "os";
-import { join } from "path";
+import { dirname, isAbsolute, join, relative, resolve } from "path";
 
 // src/templates.ts
 var PROVIDER_TEMPLATES = {
@@ -7353,6 +7353,56 @@ function applyProviderTemplate(template, apiKey) {
 // src/config.ts
 var CONFIG_DIR = join(homedir(), ".claude-multi");
 var CONFIG_FILE = join(CONFIG_DIR, "config.json");
+var SYNC_DIRS = ["plugins", "skills"];
+function lstatSafe(path) {
+  try {
+    return lstatSync(path);
+  } catch {
+    return null;
+  }
+}
+function resolveSymlinkTarget(symlinkPath) {
+  try {
+    const link = readlinkSync(symlinkPath);
+    if (isAbsolute(link))
+      return link;
+    return resolve(dirname(symlinkPath), link);
+  } catch {
+    return null;
+  }
+}
+async function ensureDirSymlink(params) {
+  const { configDir, sourceBaseDir, dir, logLabel } = params;
+  const targetPath = join(configDir, dir);
+  const sourcePath = join(sourceBaseDir, dir);
+  if (!existsSync(sourcePath)) {
+    if (logLabel) {
+      console.log(source_default.yellow(`  \u26A0 Source ${dir} not found in ${logLabel}, skipping`));
+    }
+    return "skipped";
+  }
+  const existing = lstatSafe(targetPath);
+  if (existing) {
+    if (existing.isSymbolicLink()) {
+      const resolvedExisting = resolveSymlinkTarget(targetPath);
+      if (resolvedExisting === sourcePath) {
+        if (logLabel)
+          console.log(source_default.gray(`  \u2713 ${dir} already synced`));
+        return "already";
+      }
+      rmSync(targetPath, { force: true });
+    } else {
+      rmSync(targetPath, { force: true, recursive: true });
+    }
+  }
+  const linkTarget = relative(configDir, sourcePath);
+  const type = process.platform === "win32" ? "junction" : "dir";
+  await symlink(linkTarget, targetPath, type);
+  if (logLabel) {
+    console.log(source_default.green(`  \u2713 Symlinked: ${dir} -> ${logLabel}/${dir}`));
+  }
+  return "linked";
+}
 function ensureConfigDir() {
   if (!existsSync(CONFIG_DIR)) {
     mkdirSync(CONFIG_DIR, { recursive: true });
@@ -7420,6 +7470,39 @@ function getDefaultClaudeDir() {
   }
   return join(homedir(), ".claude");
 }
+function isBrokenSymlink(path) {
+  try {
+    const stats = lstatSync(path);
+    if (!stats.isSymbolicLink())
+      return false;
+    const target = readlinkSync(path);
+    if (!target)
+      return true;
+    let targetPath;
+    if (isAbsolute(target)) {
+      targetPath = target;
+    } else {
+      targetPath = resolve(dirname(path), target);
+    }
+    return !existsSync(targetPath);
+  } catch {
+    return false;
+  }
+}
+function detectBrokenSymlinks(configDir) {
+  const result = { broken: [], all: [] };
+  for (const dir of SYNC_DIRS) {
+    const targetPath = join(configDir, dir);
+    try {
+      const stats = lstatSync(targetPath);
+      result.all.push(dir);
+      if (stats.isSymbolicLink() && isBrokenSymlink(targetPath)) {
+        result.broken.push(dir);
+      }
+    } catch {}
+  }
+  return result;
+}
 function hasDefaultClaudeConfig() {
   const defaultDir = getDefaultClaudeDir();
   const settingsFile = join(defaultDir, "settings.json");
@@ -7458,7 +7541,6 @@ async function copyAllFromDefault(targetConfigDir, autoSync = true) {
   if (!existsSync(targetConfigDir)) {
     await mkdir(targetConfigDir, { recursive: true });
   }
-  const symlinkDirs = ["plugins", "skills"];
   const excludeFiles = [
     "config.json",
     ".config.json",
@@ -7483,18 +7565,12 @@ async function copyAllFromDefault(targetConfigDir, autoSync = true) {
         continue;
       }
       if (stat.isDirectory()) {
-        if (autoSync && symlinkDirs.includes(entry)) {
-          if (existsSync(targetPath)) {
-            try {
-              readlinkSync(targetPath);
-              unlinkSync(targetPath);
-            } catch {
-              rmSync(targetPath, { force: true, recursive: true });
-            }
-          }
-          const absoluteSource = join(homedir(), ".claude", entry);
-          await symlink(absoluteSource, targetPath, "dir");
-          console.log(`  Symlinked: ${entry} -> ~/.claude/${entry}`);
+        if (autoSync && SYNC_DIRS.includes(entry)) {
+          await ensureDirSymlink({
+            configDir: target,
+            sourceBaseDir: defaultDir,
+            dir: entry
+          });
         } else {
           if (!existsSync(targetPath)) {
             await mkdir(targetPath, { recursive: true });
@@ -7611,46 +7687,28 @@ async function createSettingsFromTemplate(targetConfigDir, template, apiKey) {
 }
 async function syncPluginsAndSkills(configDir) {
   const defaultDir = getDefaultClaudeDir();
-  const symlinkDirs = ["plugins", "skills"];
   if (!existsSync(configDir)) {
     throw new Error("Instance config directory does not exist");
   }
-  for (const dir of symlinkDirs) {
-    const targetPath = join(configDir, dir);
-    const sourcePath = join(defaultDir, dir);
-    if (!existsSync(sourcePath)) {
-      console.log(source_default.yellow(`  \u26A0 Source ${dir} not found in ~/.claude, skipping`));
-      continue;
-    }
-    if (existsSync(targetPath)) {
-      try {
-        const linkTarget = readlinkSync(targetPath);
-        const expectedTarget = join("..", "..", ".claude", dir);
-        if (linkTarget === expectedTarget || linkTarget === sourcePath) {
-          console.log(source_default.gray(`  \u2713 ${dir} already synced`));
-          continue;
-        }
-        rmSync(targetPath, { force: true });
-      } catch {
-        rmSync(targetPath, { force: true, recursive: true });
-      }
-    }
-    const relativePath = join("..", "..", ".claude", dir);
-    await symlink(relativePath, targetPath, "dir");
-    console.log(source_default.green(`  \u2713 Symlinked: ${dir} -> ~/.claude/${dir}`));
+  for (const dir of SYNC_DIRS) {
+    await ensureDirSymlink({
+      configDir,
+      sourceBaseDir: defaultDir,
+      dir,
+      logLabel: defaultDir
+    });
   }
 }
 async function unsyncPluginsAndSkills(configDir) {
   const defaultDir = getDefaultClaudeDir();
-  const symlinkDirs = ["plugins", "skills"];
   if (!existsSync(configDir)) {
     throw new Error("Instance config directory does not exist");
   }
-  for (const dir of symlinkDirs) {
+  for (const dir of SYNC_DIRS) {
     const targetPath = join(configDir, dir);
     const sourcePath = join(defaultDir, dir);
     if (!existsSync(sourcePath)) {
-      console.log(source_default.yellow(`  \u26A0 Source ${dir} not found in ~/.claude, skipping`));
+      console.log(source_default.yellow(`  \u26A0 Source ${dir} not found in ${defaultDir}, skipping`));
       continue;
     }
     let isSymlink = false;
@@ -7737,7 +7795,7 @@ async function listAvailablePlugins() {
 // src/wrapper.ts
 import { existsSync as existsSync2, mkdirSync as mkdirSync2, chmodSync, unlinkSync as unlinkSync2 } from "fs";
 import { writeFile as writeFile2 } from "fs/promises";
-import { resolve, dirname } from "path";
+import { resolve as resolve2, dirname as dirname2 } from "path";
 import { execSync } from "child_process";
 function getClaudePath() {
   try {
@@ -7787,7 +7845,7 @@ set "CLAUDE_CONFIG_DIR=${options.configDir}"
 }
 async function createWrapper(options) {
   const { binaryPath, configDir } = options;
-  const binDir = dirname(binaryPath);
+  const binDir = dirname2(binaryPath);
   if (!existsSync2(binDir)) {
     mkdirSync2(binDir, { recursive: true });
   }
@@ -7809,9 +7867,9 @@ function removeWrapper(binaryPath) {
   }
 }
 function getDefaultBinaryPath(name) {
-  const binDir = process.platform === "win32" ? resolve(process.env.LOCALAPPDATA || "", "bun", "bin") : resolve(process.env.HOME || "", ".local", "bin");
+  const binDir = process.platform === "win32" ? resolve2(process.env.LOCALAPPDATA || "", "bun", "bin") : resolve2(process.env.HOME || "", ".local", "bin");
   const binaryName = process.platform === "win32" ? `claude-${name}.cmd` : `claude-${name}`;
-  return resolve(binDir, binaryName);
+  return resolve2(binDir, binaryName);
 }
 
 // src/version.ts
@@ -8160,6 +8218,9 @@ program2.command("auto-sync <name> <status>").description("Toggle auto-sync for
     process.exit(1);
   }
 });
+program2.command("fix-symlinks [name...]").description("Fix broken symlinks for instances (auto-detects and repairs)").option("-a, --all", "Fix all instances").action(async (names, options) => {
+  await handleFixSymlinks(names, options.all);
+});
 program2.command("plugins").description("Manage enabled plugins for instances").argument("[action]", "Action to perform (list, enable, disable, copy)", "list").argument("[instance]", "Instance name (for list/enable/disable)", "").argument("[plugins...]", "Plugin IDs to enable/disable", []).action(async (action = "list", instanceName = "", plugins = []) => {
   try {
     switch (action) {
@@ -8317,6 +8378,55 @@ async function handlePluginsCopy(instanceName) {
   const enabledCount = Object.values(defaultPlugins).filter((v) => v === true).length;
   console.log(source_default.green(`\u2713 Copied ${enabledCount} enabled plugins to '${instanceName}'`));
 }
+async function handleFixSymlinks(names, fixAll) {
+  const instances = await listInstances();
+  if (instances.length === 0) {
+    console.log(source_default.yellow("No instances found."));
+    return;
+  }
+  let instancesToFix;
+  if (fixAll) {
+    instancesToFix = instances;
+  } else if (names.length > 0) {
+    instancesToFix = names.map((name) => instances.find((i) => i.name === name)).filter(Boolean);
+  } else {
+    const { selected } = await import_prompts.default({
+      type: "multiselect",
+      name: "selected",
+      message: "Select instances to fix:",
+      choices: instances.map((i) => ({
+        title: `${i.name} ${i.autoSync ? "(auto-sync)" : "(manual)"}`,
+        value: i.name
+      }))
+    });
+    instancesToFix = selected.map((name) => instances.find((i) => i.name === name)).filter(Boolean);
+  }
+  for (const instance of instancesToFix) {
+    const diagnosis = detectBrokenSymlinks(instance.configDir);
+    const needsFix = diagnosis.broken.length > 0;
+    console.log(source_default.bold(`
+\uD83D\uDD0D ${instance.name}`));
+    console.log(`  Config: ${instance.configDir}`);
+    console.log(`  Auto-sync: ${instance.autoSync ? "enabled" : "disabled"}`);
+    if (diagnosis.all.length === 0) {
+      console.log(source_default.gray("  No symlinks found (manual mode)"));
+      continue;
+    }
+    if (needsFix) {
+      console.log(source_default.red(`  \u274C Broken: ${diagnosis.broken.join(", ")}`));
+      if (instance.autoSync) {
+        await syncPluginsAndSkills(instance.configDir);
+        console.log(source_default.green(`  \u2705 Fixed: ${diagnosis.broken.join(", ")}`));
+      } else {
+        console.log(source_default.yellow("  \u26A0 Auto-sync is disabled. Enable it first."));
+      }
+    } else {
+      console.log(source_default.green(`  \u2705 All symlinks OK: ${diagnosis.all.join(", ")}`));
+    }
+  }
+  console.log(source_default.bold(`
+\u2728 Done!`));
+}
 program2.command("interactive").alias("i").description("Launch interactive mode for managing Claude Code instances").action(async () => {
   try {
     await runInteractiveMode();
@@ -8348,6 +8458,7 @@ async function runInteractiveMode() {
             { title: "\u2139\uFE0F  Show instance details", value: "info" },
             { title: "\uD83D\uDD0C Manage plugins", value: "plugins" },
             { title: "\uD83D\uDD04 Toggle auto-sync", value: "autosync" },
+            { title: "\uD83D\uDD04 Re-sync symlinks", value: "resync" },
             { title: "\uD83D\uDDD1\uFE0F  Remove instance", value: "remove" }
           ] : [],
           { title: "\uD83D\uDEAA Exit", value: "exit" }
@@ -8375,6 +8486,9 @@ async function runInteractiveMode() {
         case "autosync":
           await handleToggleAutoSync(instances);
           break;
+        case "resync":
+          await handleFixSymlinks([], false);
+          break;
         case "remove":
           await handleRemoveInstance(instances);
           break;
@@ -8719,6 +8833,7 @@ async function handleToggleAutoSync(instances) {
     message: `Auto-sync is currently ${source_default.cyan(currentStatus ? "enabled" : "disabled")}. What would you like to do?`,
     choices: [
       { title: currentStatus ? "Turn off (copy files locally)" : "Turn on (use symlinks)", value: "toggle" },
+      ...currentStatus ? [{ title: "Force re-sync now (rebuild symlinks)", value: "force-sync" }] : [],
       { title: "Cancel", value: "cancel" }
     ],
     initial: 0
@@ -8727,11 +8842,20 @@ async function handleToggleAutoSync(instances) {
     console.log(source_default.yellow("\u2717 Cancelled"));
     return;
   }
-  const newStatus = !currentStatus;
-  console.log(source_default.bold(`
+  try {
+    if (action === "force-sync") {
+      console.log(source_default.bold(`
+\uD83D\uDD04 Re-syncing symlinks for '${instanceName}'...
+`));
+      await syncPluginsAndSkills(instance.configDir);
+      console.log(source_default.green(`
+\u2713 Symlinks rebuilt for '${instanceName}'`));
+      return;
+    }
+    const newStatus = !currentStatus;
+    console.log(source_default.bold(`
 \uD83D\uDD04 ${newStatus ? "Enabling" : "Disabling"} auto-sync for '${instanceName}'...
 `));
-  try {
     await updateInstanceAutoSync(instanceName, newStatus);
     if (newStatus) {
       await syncPluginsAndSkills(instance.configDir);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "claude-multi",
-  "version": "0.4.2",
+  "version": "0.4.4",
   "description": "Manage multiple Claude Code instances with different aliases and configurations",
   "type": "module",
   "bin": {