fix(v030): SyncConflict noteId→path + populate localText/remoteText (final review fix)

final code review (Opus) 발견 2 important issues:

1. SyncConflict.noteId 가 실제로 export filename slug (date-id8-slug) 였음 — UUID 가
   아니라 git checkout path 의 stem. 명명 혼동 → 'path' 로 rename (실제 의미와 일치).
2. ConflictModal preview 가 항상 빈 문자열이라 사용자가 비교 없이 local/remote 선택해야
   했음. runSync 의 conflict 분기에서 `git show :2:<path>` (ours) + `:3:<path>`
   (theirs) 호출 추가하여 localText/remoteText 채움.

영향:
- SyncService.SyncConflict + shared/types.ts.SyncConflict: noteId → path
- SyncService.resolveConflict(path, choice) — 'notes/...md' 그대로 받음
- pathToNoteId 헬퍼 제거 (불필요)
- ConflictModal: c.noteId → c.path, busy 상태 + 표시 모두 path 키
- IPC handler / preload bridge / InboxApi 시그니처 모두 path 로 통일
- SyncService.bidirectional/resolveConflict/sync-ipc/ConflictModal 4 test 갱신

regression 회귀 패턴 검사: rename 후 NoteRepository / SyncService / IPC / UI 의 모든
conflict-related path 일관 (typecheck 0).

tests/unit/SyncService.bidirectional.test.ts

@@ -20,6 +20,7 @@ describe('SyncService.sync — 양방향', () => {
     rebaseAbort: ReturnType<typeof vi.fn>;
     listConflicts: ReturnType<typeof vi.fn>;
     push: ReturnType<typeof vi.fn>;
+    run: ReturnType<typeof vi.fn>;
   };
 
   beforeEach(() => {
@@ -36,7 +37,8 @@ describe('SyncService.sync — 양방향', () => {
       rebaseOnto: vi.fn(async () => ({ stdout: '', stderr: '', exitCode: 0 })),
       rebaseAbort: vi.fn(async () => ({ stdout: '', stderr: '', exitCode: 0 })),
       listConflicts: vi.fn(async () => []),
-      push: vi.fn(async () => {})
+      push: vi.fn(async () => {}),
+      run: vi.fn(async () => ({ stdout: '', stderr: '', exitCode: 0 }))
     };
     (GitClient as unknown as ReturnType<typeof vi.fn>).mockImplementation(function () { return gitInstance; });
     svc = new SyncService(
@@ -67,14 +69,24 @@ describe('SyncService.sync — 양방향', () => {
     expect(r.ok).toBe(true);
   });
 
-  it('rebase 실패 → abort + reason=conflict + conflicts 포함', async () => {
+  it('rebase 실패 → abort + reason=conflict + conflicts 포함 (path + localText/remoteText)', async () => {
     gitInstance.rebaseOnto.mockResolvedValueOnce({ stdout: '', stderr: 'CONFLICT', exitCode: 1 });
     gitInstance.listConflicts.mockResolvedValueOnce(['notes/aaa.md', 'notes/bbb.md']);
+    // Cut E final review fix — runSync calls git.run(['show', ':2:path']) and ':3:path'
+    // for each conflict. Mock returns ours/theirs text per call.
+    gitInstance.run
+      .mockResolvedValueOnce({ stdout: 'aaa local', stderr: '', exitCode: 0 })  // :2:notes/aaa.md
+      .mockResolvedValueOnce({ stdout: 'aaa remote', stderr: '', exitCode: 0 }) // :3:notes/aaa.md
+      .mockResolvedValueOnce({ stdout: 'bbb local', stderr: '', exitCode: 0 })  // :2:notes/bbb.md
+      .mockResolvedValueOnce({ stdout: 'bbb remote', stderr: '', exitCode: 0 }); // :3:notes/bbb.md
     const r = await svc.sync();
     expect(gitInstance.rebaseAbort).toHaveBeenCalled();
     expect(r.ok).toBe(false);
     expect(r.reason).toBe('conflict');
-    expect(r.conflicts?.length).toBe(2);
+    expect(r.conflicts).toEqual([
+      { path: 'notes/aaa.md', localText: 'aaa local', remoteText: 'aaa remote' },
+      { path: 'notes/bbb.md', localText: 'bbb local', remoteText: 'bbb remote' }
+    ]);
     expect(gitInstance.push).not.toHaveBeenCalled();
   });