ccsini 0.1.43 → 0.1.45

package/dist/index.js

@@ -27930,6 +27930,7 @@ var init_constants = __esm(() => {
     "**/dist/**",
     "**/.git/**",
     "**/*.bak",
+    "**/*.conflict",
     "settings.*.json",
     "history.jsonl"
   ];
@@ -28019,7 +28020,7 @@ var {
 } = import__.default;
 
 // src/version.ts
-var VERSION = "0.1.43";
+var VERSION = "0.1.45";
 
 // src/commands/init.ts
 init_source();
@@ -29358,6 +29359,7 @@ async function pushSync(client, masterKey, deviceName, configDir, onProgress, se
   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);
@@ -29378,6 +29380,25 @@ 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) {
+    const merges = toPush.filter((d) => d.action === "merge" && d.remoteHash);
+    for (const diff of merges) {
+      try {
+        let encrypted;
+        try {
+          encrypted = await client.downloadBlob(blobKey(diff.path, diff.remoteHash));
+        } catch {
+          encrypted = await client.downloadBlob(diff.remoteHash);
+        }
+        const decrypted = decryptFile(masterKey, diff.path, encrypted);
+        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 {}
+    }
+  }
   let uploaded = 0;
   const failedPaths = new Set;
   const chunks = chunkArray(toPush, MAX_CONCURRENT_TRANSFERS);
@@ -29434,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...");
@@ -29451,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;
@@ -29466,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...");
@@ -29505,11 +29530,18 @@ async function pullSync(client, masterKey, deviceName, configDir, onProgress, se
           if (localEntry && entry) {
             const result = mergeLastWriteWins(localContent, remoteContent, localEntry.modified, entry.modified);
             await writeFile5(localPath2, result.content);
-            await writeFile5(`${localPath2}.bak`, result.backupContent);
+            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;
         }
         const localPath = join6(claudeDir, diff.path);
         await mkdir2(dirname(localPath), { recursive: true });
@@ -29536,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) {
@@ -29923,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 () => {
@@ -29943,6 +29979,9 @@ function registerAutoCommands(program2) {
       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 () => {
@@ -30207,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);
@@ -30246,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);

package/package.json

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