Skip to content

Self-hosted, Self-Improving, Federated Everything App — dev management, agent orchestration, persistent mind, digital twin, second brain, and creative pipeline from a single dashboard over Tailscale to port the user into the OS

fix: test feedback merge through applyDigitalTwinRemote (#12441)

[._.]/ Adam Eivy0d7d7a42863e
diff --git a/server/services/digital-twin-sync.js b/server/services/digital-twin-sync.js
index 085d38db7a..e16fbdbffa 100644
--- a/server/services/digital-twin-sync.js
+++ b/server/services/digital-twin-sync.js
@@ -254,7 +254,7 @@ function pickStatus(a, b) {
* survives on both. Counters never drop below what either side recorded; the
* weight adjustments follow whichever side recalculated last.
*/
-export function mergeFeedback(local, remote) {
+function mergeFeedback(local, remote) {
if (!isPlainObject(remote) || !Array.isArray(remote.entries)) return { merged: local, changed: false };
if (!isPlainObject(local)) return { merged: remote, changed: true };
diff --git a/server/services/feedbackLoop.test.js b/server/services/feedbackLoop.test.js
index 96ba650be5..057c150209 100644
--- a/server/services/feedbackLoop.test.js
+++ b/server/services/feedbackLoop.test.js
@@ -11,6 +11,7 @@ vi.mock('../lib/fileUtils.js', async () => {
});
vi.mock('./digital-twin.js', () => ({ digitalTwinEvents: { emit: vi.fn() } }));
+vi.mock('../lib/backupSnapshotBoundary.js', () => ({ withBackupAssetPublication: work => work() }));
const FILE = join(tempRoot, 'digital-twin', 'feedback.json');
const entry = (id, createdAt, validation = 'sounds_like_me') => ({ id, validation, createdAt, contentType: 'enrichment', documentsUsed: [] });
@@ -32,7 +33,7 @@ beforeEach(async () => {
});
afterAll(cleanup);
-const merge = (remote) => feedback.applyFeedbackMerge((local) => sync.mergeFeedback(local, remote));
+const merge = async (remote) => (await sync.applyDigitalTwinRemote({ feedback: remote })).count > 0;
describe('feedback peer merge vs local submit', () => {
it('keeps synced entries when a local submit follows a peer merge (stale cache)', async () => {
@@ -54,7 +55,9 @@ describe('feedback peer merge vs local submit', () => {
await merge(b);
const onA = (await readDisk()).entries.map((e) => e.id).sort();
- const onB = sync.mergeFeedback(b, a).merged.entries.map((e) => e.id).sort();
+ await writeFile(FILE, JSON.stringify(b));
+ await merge(a);
+ const onB = (await readDisk()).entries.map((e) => e.id).sort();
expect(onA).toEqual(['a-only', 'b-only', 'shared']);
expect(onB).toEqual(onA);
});