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).
2026-05-10 04:10:59 +09:00
parent 2ef4802050
commit 401414608b
9 changed files with 85 additions and 60 deletions
--- a/src/main/ipc/settingsApi.ts
+++ b/src/main/ipc/settingsApi.ts
@@ -359,12 +359,12 @@ export function registerSettingsApi(deps?: SettingsIpcDeps): void {
  // sync:list-conflicts — SyncService 캐시 결과
  ipcMain.handle('sync:list-conflicts', () => deps.syncSvc.listConflicts());

-  // sync:resolve-conflict — local/remote 2 choice
-  ipcMain.handle('sync:resolve-conflict', async (_e, noteId: string, choice: 'local' | 'remote') => {
+  // sync:resolve-conflict — local/remote 2 choice. path = git index conflict 경로.
+  ipcMain.handle('sync:resolve-conflict', async (_e, path: string, choice: 'local' | 'remote') => {
    if (choice !== 'local' && choice !== 'remote') {
      return { ok: false as const, reason: 'invalid choice' };
    }
-    return deps.syncSvc.resolveConflict(noteId, choice);
+    return deps.syncSvc.resolveConflict(path, choice);
  });

  // sync:get-status — lastAt + lastResult + nextAt 계산
--- a/src/main/services/SyncService.ts
+++ b/src/main/services/SyncService.ts
@@ -4,8 +4,14 @@ import type { ExportService } from './ExportService.js';
 import type { ImportService } from './ImportService.js';
 import { GitClient } from './GitClient.js';

+/**
+ * Cut E final review fix: 'noteId' was misleading — F5 export filenames are
+ * `<date>-<id8>-<slug>.md` (composeFilename), not `<uuid>.md`. The git checkout /
+ * resolve operations use the FULL relative path (e.g., `notes/2026-05-09-abc12345-회의.md`).
+ * `path` matches what we actually pass to `git checkout --ours/theirs`.
+ */
 export interface SyncConflict {
-  noteId: string;
+  path: string;
  localText: string;
  remoteText: string;
 }
@@ -68,21 +74,23 @@ export class SyncService {

  /**
   * v0.3.0 Cut E — conflict 해결. local/remote 2 choice (both deferred to v0.3.1+).
-   * 사용자가 ConflictModal 에서 선택 → IPC → 본 메서드. 각 noteId 별 호출.
+   * 사용자가 ConflictModal 에서 선택 → IPC → 본 메서드. 각 conflict 의 path 별 호출.
   *
   * - 'local' = 내 것 사용 (origin 변경 폐기) → git checkout --ours
   * - 'remote' = 원격 사용 → git checkout --theirs + applySyncFromDir (local DB 갱신)
   *
   * 모든 conflict 해결 후 rebase --continue 가 성공 → push.
   * UI 가 여러 conflict 를 loop 호출하면 마지막 호출에서 push 까지 완료.
+   *
+   * Cut E final review fix: 파라미터를 path 로 변경 (옛 noteId 는 export filename slug,
+   * UUID 아님 — 혼동 회피).
   */
  async resolveConflict(
-    noteId: string,
+    path: string,
    choice: 'local' | 'remote'
  ): Promise<{ ok: true } | { ok: false; reason: string }> {
    const git = new GitClient(this.syncDir);
    const flag = choice === 'local' ? '--ours' : '--theirs';
-    const path = `notes/${noteId}.md`;

    const checkout = await git.run(['checkout', flag, path]);
    if (checkout.exitCode !== 0) {
@@ -111,8 +119,8 @@ export class SyncService {
      return { ok: false, reason: `push failed: ${(e as Error).message}` };
    }

-    // Remove this noteId from cached conflicts list
-    this.lastConflicts = this.lastConflicts.filter((c) => c.noteId !== noteId);
+    // Remove this path from cached conflicts list
+    this.lastConflicts = this.lastConflicts.filter((c) => c.path !== path);

    return { ok: true };
  }
@@ -154,12 +162,21 @@ export class SyncService {
      const rebaseR = await git.rebaseOnto('origin/main');
      if (rebaseR.exitCode !== 0) {
        const files = await git.listConflicts();
+        // Cut E final review fix — populate localText/remoteText from rebase index
+        // BEFORE aborting. `git show :2:<path>` = ours (local during rebase),
+        // `:3:<path>` = theirs (remote being applied). UI shows side-by-side diff.
+        const conflicts: SyncConflict[] = [];
+        for (const path of files) {
+          const ours = await git.run(['show', `:2:${path}`]);
+          const theirs = await git.run(['show', `:3:${path}`]);
+          conflicts.push({
+            path,
+            localText: ours.exitCode === 0 ? ours.stdout : '',
+            remoteText: theirs.exitCode === 0 ? theirs.stdout : ''
+          });
+        }
        await git.rebaseAbort();
-        return {
-          ok: false,
-          reason: 'conflict',
-          conflicts: files.map((path) => ({ noteId: this.pathToNoteId(path), localText: '', remoteText: '' }))
-        };
+        return { ok: false, reason: 'conflict', conflicts };
      }
    }

@@ -182,12 +199,4 @@ export class SyncService {
    return { ok: true, changed: localChanged || importedCount > 0, localSha, importedCount, pushed: true };
  }

-  private pathToNoteId(path: string): string {
-    // notes/<id>.md or notes/<date>-<id8>-<slug>.md → extract id (best effort).
-    // Cut E note: F5 export uses date-id8-slug filename; full id is in frontmatter.
-    // For Cut E conflict listing we expose the file path-derived heuristic; the
-    // conflict modal will read frontmatter to recover the full id when needed.
-    const m = /notes\/(.+)\.md$/.exec(path);
-    return m ? m[1]! : path;
-  }
 }
--- a/src/preload/index.ts
+++ b/src/preload/index.ts
@@ -92,8 +92,8 @@ const api: InklingApi = {
    configureSync: (url: string | null) => ipcRenderer.invoke('settings:configure-sync', url),
    testSyncConnection: () => ipcRenderer.invoke('settings:test-sync-connection'),
    listConflicts: () => ipcRenderer.invoke('sync:list-conflicts'),
-    resolveConflict: (noteId: string, choice: 'local' | 'remote') =>
-      ipcRenderer.invoke('sync:resolve-conflict', noteId, choice),
+    resolveConflict: (path: string, choice: 'local' | 'remote') =>
+      ipcRenderer.invoke('sync:resolve-conflict', path, choice),
    getSyncStatus: () => ipcRenderer.invoke('sync:get-status'),
    setSyncAutoEnabled: (value: boolean) => ipcRenderer.invoke('settings:set-sync-auto-enabled', value),
    setSyncIntervalMin: (value: number) => ipcRenderer.invoke('settings:set-sync-interval-min', value),
--- a/src/renderer/inbox/components/ConflictModal.tsx
+++ b/src/renderer/inbox/components/ConflictModal.tsx
@@ -36,16 +36,16 @@ export function ConflictModal({ onClose, onResolved }: Props): React.ReactElemen
    return () => { cancelled = true; };
  }, []);

-  async function onChoose(noteId: string, choice: 'local' | 'remote') {
-    setBusy(noteId);
+  async function onChoose(path: string, choice: 'local' | 'remote') {
+    setBusy(path);
    setError(null);
-    const r = await inboxApi.resolveConflict(noteId, choice);
+    const r = await inboxApi.resolveConflict(path, choice);
    setBusy(null);
    if (!r.ok) {
      setError(`해결 실패: ${r.reason}`);
      return;
    }
-    const next = conflicts.filter((c) => c.noteId !== noteId);
+    const next = conflicts.filter((c) => c.path !== path);
    setConflicts(next);
    if (next.length === 0) {
      onResolved();
@@ -62,8 +62,8 @@ export function ConflictModal({ onClose, onResolved }: Props): React.ReactElemen
        </div>
        {error !== null && <div style={{ marginTop: 10, fontSize: 12, color: '#c93030' }}>{error}</div>}
        {conflicts.map((c) => (
-          <div key={c.noteId} style={rowStyle}>
-            <div style={{ fontSize: 12, color: '#888', marginBottom: 6 }}>note: {c.noteId}</div>
+          <div key={c.path} style={rowStyle}>
+            <div style={{ fontSize: 12, color: '#888', marginBottom: 6 }}>{c.path}</div>
            <div style={{ display: 'flex', gap: 12 }}>
              <div style={{ flex: 1 }}>
                <div style={{ fontSize: 11, color: '#666', marginBottom: 4 }}>내 기기</div>
@@ -76,18 +76,18 @@ export function ConflictModal({ onClose, onResolved }: Props): React.ReactElemen
            </div>
            <div style={{ marginTop: 8, display: 'flex', gap: 8, justifyContent: 'flex-end' }}>
              <button
-                onClick={() => { void onChoose(c.noteId, 'local'); }}
-                disabled={busy === c.noteId}
+                onClick={() => { void onChoose(c.path, 'local'); }}
+                disabled={busy === c.path}
                style={chooseBtnStyle('#0a4b80')}
              >
-                {busy === c.noteId ? '처리 중…' : '내 것 사용'}
+                {busy === c.path ? '처리 중…' : '내 것 사용'}
              </button>
              <button
-                onClick={() => { void onChoose(c.noteId, 'remote'); }}
-                disabled={busy === c.noteId}
+                onClick={() => { void onChoose(c.path, 'remote'); }}
+                disabled={busy === c.path}
                style={chooseBtnStyle('#236b1a')}
              >
-                {busy === c.noteId ? '처리 중…' : '원격 사용'}
+                {busy === c.path ? '처리 중…' : '원격 사용'}
              </button>
            </div>
          </div>
--- a/src/shared/types.ts
+++ b/src/shared/types.ts
@@ -41,8 +41,10 @@ export interface ReviewAggregate {
 }

 // v0.3.0 Cut E — 양방향 sync 결과 + conflict.
+// `path` = git index 의 conflict 파일 상대경로 (예: 'notes/2026-05-09-abc12345-회의.md').
+// F5 export 의 filename 은 date-id8-slug 패턴 — UUID 가 아니라 path 가 맞는 식별자.
 export interface SyncConflict {
-  noteId: string;
+  path: string;
  localText: string;
  remoteText: string;
 }
@@ -212,7 +214,7 @@ export interface InboxApi {
  configureSync(url: string | null): Promise<{ ok: true } | { ok: false; reason: string }>;
  testSyncConnection(): Promise<{ ok: true } | { ok: false; reason: string }>;
  listConflicts(): Promise<SyncConflict[]>;
-  resolveConflict(noteId: string, choice: 'local' | 'remote'): Promise<{ ok: true } | { ok: false; reason: string }>;
+  resolveConflict(path: string, choice: 'local' | 'remote'): Promise<{ ok: true } | { ok: false; reason: string }>;
  getSyncStatus(): Promise<SyncStatusSnapshot>;
  setSyncAutoEnabled(enabled: boolean): Promise<{ ok: true }>;
  setSyncIntervalMin(value: number): Promise<{ ok: true } | { ok: false; reason: string }>;