@claude-sync/cli 0.1.11 → 0.1.12

package/dist/bin/claude-sync.js

@@ -5166,7 +5166,7 @@ __export(sync_exports, {
 });
 import { Command as Command4 } from "commander";
 import { select as select2, isCancel as isCancel3 } from "@clack/prompts";
-import { readFile as readFile2, writeFile as writeFile2, mkdir as mkdir2, lstat as lstat2, symlink, unlink } from "fs/promises";
+import { readFile as readFile2, writeFile as writeFile2, mkdir as mkdir2, lstat as lstat2, symlink, unlink, rename } from "fs/promises";
 import { join as join3, dirname as dirname2 } from "path";
 import { homedir as homedir4 } from "os";
 async function runSync(options) {
@@ -5330,6 +5330,10 @@ async function handleFirstRun(client, config, cwd, ctx, manifest, projectDir, pr
   });
   if (isCancel3(projectChoice)) return "cancelled";
   const selectedProject = projects.find((p) => p.id === projectChoice);
+  const existingCheck = await handleExistingSessionDir(projectsDir, ctx.encodedPath);
+  if (existingCheck === "cancelled") {
+    return "cancelled";
+  }
   const downloaded = await crossMachinePull(
     client,
     config.deviceId,
@@ -5356,6 +5360,43 @@ async function handleFirstRun(client, config, cwd, ctx, manifest, projectDir, pr
   }
   return "pulled";
 }
+async function handleExistingSessionDir(projectsDir, localEncoded) {
+  const symlinkPath = join3(projectsDir, localEncoded);
+  try {
+    const stats = await lstat2(symlinkPath);
+    if (stats.isSymbolicLink()) {
+      return "continue";
+    }
+    if (stats.isDirectory()) {
+      printInfo(brand("Local session directory already exists"));
+      printInfo(dim(symlinkPath));
+      const choice = await select2({
+        message: brand("What would you like to do?"),
+        options: [
+          {
+            value: "backup",
+            label: "Backup and continue",
+            hint: dim("Move existing to .bak and sync from remote")
+          },
+          {
+            value: "cancel",
+            label: "Stop sync",
+            hint: dim("Keep existing local sessions")
+          }
+        ]
+      });
+      if (isCancel3(choice) || choice === "cancel") {
+        return "cancelled";
+      }
+      const backupPath = `${symlinkPath}.bak.${Date.now()}`;
+      await rename(symlinkPath, backupPath);
+      printSuccess(`Backed up to: ${dim(backupPath)}`);
+      return "continue";
+    }
+  } catch {
+  }
+  return "continue";
+}
 async function createProjectSymlink(projectsDir, localEncoded, foreignEncoded) {
   const symlinkPath = join3(projectsDir, localEncoded);
   await mkdir2(projectsDir, { recursive: true });
@@ -5363,10 +5404,6 @@ async function createProjectSymlink(projectsDir, localEncoded, foreignEncoded) {
     const stats = await lstat2(symlinkPath);
     if (stats.isSymbolicLink()) {
       await unlink(symlinkPath);
-    } else if (stats.isDirectory()) {
-      printError(`Local session directory already exists. Back it up first:
-  mv "${symlinkPath}" "${symlinkPath}.bak"`);
-      return;
     }
   } catch {
   }