From 2ef48020501acc96995c4dbd2639ef29b9b60e59 Mon Sep 17 00:00:00 2001 From: altair823 Date: Sun, 10 May 2026 04:01:41 +0900 Subject: [PATCH] =?UTF-8?q?chore(release):=20v0.3.0=20=E2=80=94=20Cut=20E?= =?UTF-8?q?=20(=EC=96=91=EB=B0=A9=ED=96=A5=20git=20sync=20+=20Configure=20?= =?UTF-8?q?UI=20+=20Conflict=20resolution)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - F21 promoted (✅ v0.3.0 Cut E — A+B+C 옵션, both deferred) - version 0.2.11 → 0.3.0 (semver MINOR — Major 영역 진입) - 단위 608 → 680 (+72): GitClient 5 + upsertFromSync 5 + ImportService 18 + SyncService bidirectional 5 + resolveConflict 4 + SettingsService 6 + sync IPC 17 + SyncSection 4 + ConflictModal 3 + SyncTimer 5 - typecheck 0 errors --- docs/superpowers/specs/2026-04-25-dogfood-feedback.md | 4 ++-- package-lock.json | 4 ++-- package.json | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/docs/superpowers/specs/2026-04-25-dogfood-feedback.md b/docs/superpowers/specs/2026-04-25-dogfood-feedback.md index 8bbe3ea..2c8709a 100644 --- a/docs/superpowers/specs/2026-04-25-dogfood-feedback.md +++ b/docs/superpowers/specs/2026-04-25-dogfood-feedback.md @@ -1570,9 +1570,9 @@ app.on('activate', () => { --- -## F21. 다기기 git-based 동기화 (🌱 raw — v0.2.8 후보, **부분 구현됨**) +## F21. 다기기 git-based 동기화 (✅ promoted v0.3.0 Cut E — 양방향 + Configure UI + Conflict) -**진행 상태:** 🌱 raw — `SyncService` + `GitClient` 가 이미 push-only 형태로 존재. **양방향 동기화 + UI 구성** 이 누락된 핵심 부분. v0.2.8 brainstorm 시 명확한 cut. +**진행 상태:** ✅ promoted v0.3.0 Cut E — 옵션 A (자동 rebase) + B (Configure UI) + C (conflict UI). SyncService 양방향 6단계 (export → commit → fetch → rebase → re-import → push), `NoteRepository.upsertFromSync` (sync 전용 3 분기), `SettingsService.{getSyncRepoUrl,isAutoSyncEnabled,getSyncIntervalMin}` + `SyncTimer` (자동 주기 + reconfigure), `SyncSection` UI + `ConflictModal` (local/remote 2 choice, both deferred v0.3.1+). 단위 608 → 679. dogfood 1주 soak 후 Cut F (F24 vision) 진입. **발견:** 2026-05-09 v0.2.7 release 후 본인 dogfood. 사용자 표현: "그 중심에 git repo 를 쓸 수 있으면 좋겠어". diff --git a/package-lock.json b/package-lock.json index 5b9e9a2..f2ba246 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "inkling", - "version": "0.2.11", + "version": "0.3.0", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "inkling", - "version": "0.2.11", + "version": "0.3.0", "dependencies": { "better-sqlite3": "12.9.0", "electron-log": "5.2.0", diff --git a/package.json b/package.json index 549ca97..9d4b8c9 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "inkling", - "version": "0.2.11", + "version": "0.3.0", "private": true, "description": "Inkling — local-first 한 줄 보관 도구", "author": "altair823 ",