From ad37b4322bd278675d7cec4c85174575eb3c14e7 Mon Sep 17 00:00:00 2001
From: sudacode <suda@sudacode.com>
Date: Mon, 13 Jul 2026 12:43:17 -0700
Subject: [PATCH] fix(sync-ui): clarify remote merge target

---
 src/syncui/syncui-format.test.ts | 12 +++++++++++-
 src/syncui/syncui-format.ts      |  4 ++++
 src/syncui/syncui.ts             |  9 +++++++--
 3 files changed, 22 insertions(+), 3 deletions(-)

diff --git a/src/syncui/syncui-format.test.ts b/src/syncui/syncui-format.test.ts
index b5ab19a4..868890ad 100644
--- a/src/syncui/syncui-format.test.ts
+++ b/src/syncui/syncui-format.test.ts
@@ -1,6 +1,11 @@
 import test from 'node:test';
 import assert from 'node:assert/strict';
-import { formatBytes, formatRelativeTime, summarizeMergeCounts } from './syncui-format';
+import {
+  formatBytes,
+  formatMergeTargetHeading,
+  formatRelativeTime,
+  summarizeMergeCounts,
+} from './syncui-format';
 
 test('formatBytes renders human readable sizes', () => {
   assert.equal(formatBytes(0), '0 B');
@@ -19,6 +24,11 @@ test('formatRelativeTime renders past timestamps', () => {
   assert.equal(formatRelativeTime(now - 2 * 86_400_000, now), '2 d ago');
 });
 
+test('formatMergeTargetHeading names the local and remote machines', () => {
+  assert.equal(formatMergeTargetHeading('local'), 'Merged into this machine');
+  assert.equal(formatMergeTargetHeading('remote'), 'Merged into remote machine');
+});
+
 test('summarizeMergeCounts lists only non-zero counts', () => {
   const summary = {
     sessionsMerged: 3,
diff --git a/src/syncui/syncui-format.ts b/src/syncui/syncui-format.ts
index 4d35e313..6ce3ff2f 100644
--- a/src/syncui/syncui-format.ts
+++ b/src/syncui/syncui-format.ts
@@ -1,5 +1,9 @@
 import type { SyncMergeSummary } from '../shared/sync/sync-events';
 
+export function formatMergeTargetHeading(target: 'local' | 'remote'): string {
+  return target === 'local' ? 'Merged into this machine' : 'Merged into remote machine';
+}
+
 export function formatBytes(bytes: number): string {
   if (bytes < 1024) return `${Math.round(bytes)} B`;
   const units = ['KB', 'MB', 'GB', 'TB'];
diff --git a/src/syncui/syncui.ts b/src/syncui/syncui.ts
index b2d941fd..a4c9ae49 100644
--- a/src/syncui/syncui.ts
+++ b/src/syncui/syncui.ts
@@ -7,7 +7,12 @@ import type {
   SyncUiSnapshot,
   SyncUiStartResult,
 } from '../types/sync-ui';
-import { formatBytes, formatRelativeTime, summarizeMergeCounts } from './syncui-format';
+import {
+  formatBytes,
+  formatMergeTargetHeading,
+  formatRelativeTime,
+  summarizeMergeCounts,
+} from './syncui-format';
 
 declare global {
   interface Window {
@@ -134,7 +139,7 @@ function appendMergeSummary(
   resultCard.classList.remove('hidden');
   const heading = document.createElement('div');
   heading.className = 'result-title';
-  heading.textContent = target === 'local' ? 'Merged into this machine' : 'Merged into the device';
+  heading.textContent = formatMergeTargetHeading(target);
   const grid = document.createElement('div');
   grid.className = 'count-grid';
   for (const line of lines) {