ccsini 0.1.44 → 0.1.46

package/dist/index.js

@@ -28020,7 +28020,7 @@ var {
 } = import__.default;
 
 // src/version.ts
-var VERSION = "0.1.44";
+var VERSION = "0.1.46";
 
 // src/commands/init.ts
 init_source();
@@ -29355,10 +29355,11 @@ function extractProjects(manifest) {
     lastSyncedAt: manifest.timestamp
   }));
 }
-async function pushSync(client, masterKey, deviceName, configDir, onProgress, sessionOptions) {
+async function pushSync(client, masterKey, deviceName, configDir, onProgress, sessionOptions, pushOptions) {
   const start = Date.now();
   const claudeDir = getClaudeDir();
   const errors2 = [];
+  const conflicts = [];
   let bytesTransferred = 0;
   const progress = onProgress ?? (() => {});
   const localManifest = await generateManifest(claudeDir, deviceName, progress, sessionOptions);
@@ -29379,7 +29380,7 @@ async function pushSync(client, masterKey, deviceName, configDir, onProgress, se
   const diffs = diffManifests(localManifest, remoteManifest);
   const toPush = diffs.filter((d) => d.action === "push" || d.action === "merge");
   progress(`${toPush.length} files to push`);
-  if (remoteManifest) {
+  if (remoteManifest && !pushOptions?.skipConflictBackup) {
     const merges = toPush.filter((d) => d.action === "merge" && d.remoteHash);
     for (const diff of merges) {
       try {
@@ -29393,6 +29394,7 @@ async function pushSync(client, masterKey, deviceName, configDir, onProgress, se
         const conflictPath = join6(claudeDir, `${diff.path}.conflict`);
         await mkdir2(dirname(conflictPath), { recursive: true });
         await writeFile5(conflictPath, decrypted);
+        conflicts.push(diff.path);
         progress(`Saved conflict backup: ${diff.path}.conflict`);
       } catch {}
     }
@@ -29453,13 +29455,15 @@ async function pushSync(client, masterKey, deviceName, configDir, onProgress, se
     filesChanged: toPush.length,
     bytesTransferred,
     durationMs,
-    errors: errors2
+    errors: errors2,
+    conflicts
   };
 }
 async function pullSync(client, masterKey, deviceName, configDir, onProgress, sessionOptions) {
   const start = Date.now();
   const claudeDir = getClaudeDir();
   const errors2 = [];
+  const conflicts = [];
   let bytesTransferred = 0;
   const progress = onProgress ?? (() => {});
   progress("Fetching remote manifest...");
@@ -29470,7 +29474,8 @@ async function pullSync(client, masterKey, deviceName, configDir, onProgress, se
       filesChanged: 0,
       bytesTransferred: 0,
       durationMs: Date.now() - start,
-      errors: []
+      errors: [],
+      conflicts: []
     };
   }
   let remoteManifest;
@@ -29485,7 +29490,8 @@ async function pullSync(client, masterKey, deviceName, configDir, onProgress, se
       durationMs: Date.now() - start,
       errors: [
         "Failed to decrypt remote manifest - wrong encryption password?"
-      ]
+      ],
+      conflicts: []
     };
   }
   progress("Loading local manifest...");
@@ -29525,12 +29531,14 @@ async function pullSync(client, masterKey, deviceName, configDir, onProgress, se
             const result = mergeLastWriteWins(localContent, remoteContent, localEntry.modified, entry.modified);
             await writeFile5(localPath2, result.content);
             await writeFile5(`${localPath2}.conflict`, result.backupContent);
+            conflicts.push(diff.path);
             downloaded++;
             progress(`Downloading ${downloaded}/${toPull.length}: ${diff.path}`);
             return;
           }
           await writeFile5(`${localPath2}.conflict`, localContent);
           await writeFile5(localPath2, remoteContent);
+          conflicts.push(diff.path);
           downloaded++;
           progress(`Downloading ${downloaded}/${toPull.length}: ${diff.path} (conflict saved)`);
           return;
@@ -29560,7 +29568,8 @@ async function pullSync(client, masterKey, deviceName, configDir, onProgress, se
     filesChanged: toPull.length,
     bytesTransferred,
     durationMs,
-    errors: errors2
+    errors: errors2,
+    conflicts
   };
 }
 function chunkArray(arr, size) {
@@ -29947,6 +29956,9 @@ function registerAutoCommands(program2) {
       if (result.filesChanged > 0) {
         console.log(`[ccsini] Pulled ${result.filesChanged} files (${result.durationMs}ms)`);
       }
+      if (result.conflicts.length > 0) {
+        console.log(`[ccsini] \u26A0 ${result.conflicts.length} conflict(s) \u2014 check .conflict files in ~/.claude/`);
+      }
     } catch {}
   });
   program2.command("auto-push").description("Auto-push changes (called by Claude Code hooks)").action(async () => {
@@ -29963,10 +29975,13 @@ function registerAutoCommands(program2) {
         maxPerProject: storedSession.maxPerProject,
         maxFileSize: SESSION_SYNC_DEFAULTS.maxFileSize
       };
-      const result = await pushSync(client, masterKey, config.deviceName, configDir, undefined, sessionOptions);
+      const result = await pushSync(client, masterKey, config.deviceName, configDir, undefined, sessionOptions, { skipConflictBackup: true });
       if (result.filesChanged > 0) {
         console.log(`[ccsini] Pushed ${result.filesChanged} files (${result.durationMs}ms)`);
       }
+      if (result.conflicts.length > 0) {
+        console.log(`[ccsini] \u26A0 ${result.conflicts.length} conflict(s) \u2014 check .conflict files in ~/.claude/`);
+      }
     } catch {}
   });
   program2.command("unlock").description("Enter encryption password to enable auto-sync").action(async () => {
@@ -30231,6 +30246,9 @@ function registerSyncCommands(program2) {
       if (sessionOptions.enabled) {
         console.log(chalk2.dim("  Sessions: enabled"));
       }
+      if (result.conflicts.length > 0) {
+        console.log(chalk2.yellow(`  \u26A0 ${result.conflicts.length} conflict(s) \u2014 check .conflict files in ~/.claude/`));
+      }
     } catch (e) {
       console.error(`Push failed: ${e.message}`);
       process.exit(1);
@@ -30270,6 +30288,9 @@ function registerSyncCommands(program2) {
       if (sessionOptions.enabled) {
         console.log(chalk2.dim("  Sessions: enabled"));
       }
+      if (result.conflicts.length > 0) {
+        console.log(chalk2.yellow(`  \u26A0 ${result.conflicts.length} conflict(s) \u2014 check .conflict files in ~/.claude/`));
+      }
     } catch (e) {
       console.error(`Pull failed: ${e.message}`);
       process.exit(1);
@@ -30576,6 +30597,97 @@ function registerSessionsCommand(program2) {
   });
 }
 
+// src/commands/conflicts.ts
+import { readdir as readdir2, readFile as readFile9, unlink as unlink2, writeFile as writeFile9 } from "fs/promises";
+import { join as join12, relative as relative2 } from "path";
+async function findConflictFiles(dir, base) {
+  base = base ?? dir;
+  const results = [];
+  const entries = await readdir2(dir, { withFileTypes: true });
+  for (const entry of entries) {
+    const full = join12(dir, entry.name);
+    if (entry.isDirectory()) {
+      results.push(...await findConflictFiles(full, base));
+    } else if (entry.name.endsWith(".conflict")) {
+      results.push(relative2(base, full).split("\\").join("/"));
+    }
+  }
+  return results;
+}
+function registerConflictsCommand(program2) {
+  program2.command("conflicts").description("List and resolve sync conflicts").option("--keep <side>", "Resolve all: 'local' keeps .conflict, 'remote' discards .conflict").action(async (opts) => {
+    const chalk2 = (await Promise.resolve().then(() => (init_source(), exports_source))).default;
+    const claudeDir = getClaudeDir();
+    const conflictFiles = await findConflictFiles(claudeDir);
+    if (conflictFiles.length === 0) {
+      console.log(chalk2.green("No conflicts found."));
+      return;
+    }
+    console.log(chalk2.bold(`
+  ${conflictFiles.length} conflict(s) found:
+`));
+    for (const file of conflictFiles) {
+      const original = file.replace(/\.conflict$/, "");
+      console.log(`  ${chalk2.yellow("\u26A0")} ${original}`);
+      console.log(chalk2.dim(`    conflict: ~/.claude/${file}`));
+    }
+    console.log();
+    if (opts.keep === "remote") {
+      for (const file of conflictFiles) {
+        await unlink2(join12(claudeDir, file));
+      }
+      console.log(chalk2.green(`Resolved ${conflictFiles.length} conflict(s) \u2014 kept remote versions.`));
+      return;
+    }
+    if (opts.keep === "local") {
+      for (const file of conflictFiles) {
+        const conflictPath = join12(claudeDir, file);
+        const originalPath = conflictPath.replace(/\.conflict$/, "");
+        const conflictContent = await readFile9(conflictPath);
+        await writeFile9(originalPath, conflictContent);
+        await unlink2(conflictPath);
+      }
+      console.log(chalk2.green(`Resolved ${conflictFiles.length} conflict(s) \u2014 kept local versions.`));
+      return;
+    }
+    const inquirer2 = await Promise.resolve().then(() => (init_dist16(), exports_dist));
+    for (const file of conflictFiles) {
+      const original = file.replace(/\.conflict$/, "");
+      const conflictPath = join12(claudeDir, file);
+      const originalPath = join12(claudeDir, original);
+      const { action } = await inquirer2.default.prompt([
+        {
+          type: "list",
+          name: "action",
+          message: `${original}:`,
+          choices: [
+            { name: "Keep remote (current file)", value: "remote" },
+            { name: "Keep local (restore from .conflict)", value: "local" },
+            { name: "Skip", value: "skip" }
+          ]
+        }
+      ]);
+      if (action === "remote") {
+        await unlink2(conflictPath);
+        console.log(chalk2.dim(`  Kept remote \u2014 deleted ${file}`));
+      } else if (action === "local") {
+        const conflictContent = await readFile9(conflictPath);
+        await writeFile9(originalPath, conflictContent);
+        await unlink2(conflictPath);
+        console.log(chalk2.dim(`  Restored local version`));
+      }
+    }
+    const remaining = await findConflictFiles(claudeDir);
+    if (remaining.length === 0) {
+      console.log(chalk2.green(`
+All conflicts resolved.`));
+    } else {
+      console.log(chalk2.yellow(`
+${remaining.length} conflict(s) remaining.`));
+    }
+  });
+}
+
 // src/commands/menu.ts
 init_source();
 init_dist16();
@@ -30642,6 +30754,7 @@ registerSyncCommands(program2);
 registerHooksCommands(program2);
 registerResetCommand(program2);
 registerSessionsCommand(program2);
+registerConflictsCommand(program2);
 program2.command("version").description("Show current version").action(() => {
   console.log(VERSION);
 });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ccsini",
-  "version": "0.1.44",
+  "version": "0.1.46",
   "description": "Claude Code seamless sync across devices",
   "type": "module",
   "bin": {