claude-multi 0.4.3 → 0.4.4

package/dist/cli.js

@@ -7289,7 +7289,7 @@ import { join as join3 } from "path";
 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 });
@@ -7428,7 +7478,6 @@ function isBrokenSymlink(path) {
     const target = readlinkSync(path);
     if (!target)
       return true;
-    const { resolve, dirname, isAbsolute } = __require("path");
     let targetPath;
     if (isAbsolute(target)) {
       targetPath = target;
@@ -7441,9 +7490,8 @@ function isBrokenSymlink(path) {
   }
 }
 function detectBrokenSymlinks(configDir) {
-  const symlinkDirs = ["plugins", "skills"];
   const result = { broken: [], all: [] };
-  for (const dir of symlinkDirs) {
+  for (const dir of SYNC_DIRS) {
     const targetPath = join(configDir, dir);
     try {
       const stats = lstatSync(targetPath);
@@ -7493,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",
@@ -7518,25 +7565,12 @@ async function copyAllFromDefault(targetConfigDir, autoSync = true) {
         continue;
       }
       if (stat.isDirectory()) {
-        if (autoSync && symlinkDirs.includes(entry)) {
-          if (existsSync(targetPath)) {
-            const absoluteSource2 = join(homedir(), ".claude", entry);
-            const stat2 = lstatSync(targetPath);
-            if (stat2.isSymbolicLink()) {
-              const currentTarget = readlinkSync(targetPath);
-              if (currentTarget === absoluteSource2) {
-                console.log(`  \u2713 Already symlinked: ${entry}`);
-                continue;
-              }
-              console.log(source_default.yellow(`  \u26A0 Replacing incorrect symlink: ${entry}`));
-            } else {
-              console.log(source_default.yellow(`  \u26A0 Removing existing directory: ${entry}`));
-            }
-            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 });
@@ -7653,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;
@@ -7779,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 {
@@ -7829,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 });
   }
@@ -7851,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
@@ -8817,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
@@ -8825,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.3",
+  "version": "0.4.4",
   "description": "Manage multiple Claude Code instances with different aliases and configurations",
   "type": "module",
   "bin": {