ccsini 0.1.43 → 0.1.44

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.44";
 
 // src/commands/init.ts
 init_source();
@@ -29378,6 +29379,24 @@ 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);
+        progress(`Saved conflict backup: ${diff.path}.conflict`);
+      } catch {}
+    }
+  }
   let uploaded = 0;
   const failedPaths = new Set;
   const chunks = chunkArray(toPush, MAX_CONCURRENT_TRANSFERS);
@@ -29505,11 +29524,16 @@ 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);
             downloaded++;
             progress(`Downloading ${downloaded}/${toPull.length}: ${diff.path}`);
             return;
           }
+          await writeFile5(`${localPath2}.conflict`, localContent);
+          await writeFile5(localPath2, remoteContent);
+          downloaded++;
+          progress(`Downloading ${downloaded}/${toPull.length}: ${diff.path} (conflict saved)`);
+          return;
         }
         const localPath = join6(claudeDir, diff.path);
         await mkdir2(dirname(localPath), { recursive: true });

package/package.json

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