fixed: enhance conflict handling by adding settings check for document writes

src/apps/cli/test/test-mirror-linux.sh

@@ -43,6 +43,15 @@ cli_test_init_settings_file "$SETTINGS_FILE"
 # isConfigured=true is required for mirror (canProceedScan checks this)
 cli_test_mark_settings_configured "$SETTINGS_FILE"
 
+# Enable writeDocumentsIfConflicted to resolve unsynced conflicts during mirror
+node -e '
+const fs = require("fs");
+const file = process.argv[1];
+const data = JSON.parse(fs.readFileSync(file, "utf-8"));
+data.writeDocumentsIfConflicted = true;
+fs.writeFileSync(file, JSON.stringify(data, null, 2));
+' "$SETTINGS_FILE"
+
 # Preparation: Sync settings and files logic
 DB_SETTINGS="$DB_DIR/settings.json"
 cp "$SETTINGS_FILE" "$DB_SETTINGS"

src/apps/cli/testdeno/test-mirror.ts

@@ -39,6 +39,10 @@ Deno.test("mirror: storage <-> DB synchronisation", async (t) => {
     // isConfigured=true is required for canProceedScan in the mirror command.
     await markSettingsConfigured(settingsFile);
 
+    const data = JSON.parse(await Deno.readTextFile(settingsFile));
+    data.writeDocumentsIfConflicted = true;
+    await Deno.writeTextFile(settingsFile, JSON.stringify(data, null, 2));
+
     // Copy settings to the DB directory (separated-path mode)
     const dbSettings = workDir.join("db", "settings.json");
     await Deno.copyFile(settingsFile, dbSettings);