Merge master into main

docs/TASKS.md

@@ -35,6 +35,7 @@ requirement is missing and blocks implementation, record it in
 -   [x] Create new/open/save song projects locally.
 -   [x] Implement project list.
 -   [x] Implement immutable or snapshot-based version history.
+<<<<<<< HEAD
 -   [x] Restore a previous version without destroying later versions.
 -   [x] Add autosave strategy that does not create excessive versions.
 
@@ -49,14 +50,37 @@ requirement is missing and blocks implementation, record it in
     timestamp-based placement.
 -   [x] Add Manual/Auto toggles for supported controls.
 -   [x] Build final review screen where every generated field can be
+=======
+-   [ ] Restore a previous version without destroying later versions.
+-   [ ] Add autosave strategy that does not create excessive versions.
+
+## Phase 3 --- Core macOS UI
+
+-   [ ] Build project browser.
+-   [ ] Build natural chat workspace as the primary entry point.
+-   [ ] Build editable project inspector for duration, genres,
+    instruments, vocals and language.
+-   [ ] Build song structure editor.
+-   [ ] Build arrangement editor supporting section-based and
+    timestamp-based placement.
+-   [ ] Add Manual/Auto toggles for supported controls.
+-   [ ] Build final review screen where every generated field can be
+>>>>>>> origin/master
     edited.
 
 ## Phase 4 --- OpenAI Integration
 
+<<<<<<< HEAD
 -   [x] Create provider-independent `AIService` interface.
 -   [x] Implement OpenAI client.
 -   [x] Define private application-rule injection mechanism.
 -   [x] Define structured AI response schema for SongProject updates.
+=======
+-   [ ] Create provider-independent `AIService` interface.
+-   [ ] Implement OpenAI client.
+-   [ ] Define private application-rule injection mechanism.
+-   [ ] Define structured AI response schema for SongProject updates.
+>>>>>>> origin/master
 -   [ ] Implement idea → complete project generation.
 -   [ ] Implement existing lyrics → correction/improvement flow.
 -   [ ] Implement Auto mode for structure, arrangement, BPM/key/maqam