sync for v0.9.0

CHANGELOG.md

@@ -1,6 +1,6 @@
 # Changelog
 
-## [0.9.0] - 2026-04-26
+## [0.9.0] - 2026-04-27
 
 ### Added
 

src/frontend/features/app/useAppControlProps.ts

@@ -84,7 +84,13 @@ type UseAppMainLayoutPropsParams = {
   currentChapterId: string | null;
   handleChapterSelect: (chapterId: string | null) => void;
   deleteChapter: (chapterId: string) => Promise<void>;
-  updateChapter: (id: string, partial: Record<string, unknown>) => Promise<void>;
+  updateChapter: (
+    id: string,
+    partial: Record<string, unknown>,
+    sync?: boolean,
+    pushHistory?: boolean,
+    isUserEdit?: boolean
+  ) => Promise<void>;
   updateBook: (id: string, partial: Record<string, unknown>) => Promise<void>;
   addChapter: (title?: string, content?: string, bookId?: string) => Promise<void>;
   handleBookCreate: (title: string) => Promise<void>;
@@ -336,6 +342,7 @@ export function useAppHeaderProps(params: UseAppHeaderPropsParams): AppHeaderPro
   );
 }
 
+// eslint-disable-next-line max-lines-per-function
 export function useAppMainLayoutProps(params: UseAppMainLayoutPropsParams): {
   sidebarControls: AppMainLayoutProps['sidebarControls'];
   editorControls: AppMainLayoutProps['editorControls'];
@@ -373,8 +380,6 @@ export function useAppMainLayoutProps(params: UseAppMainLayoutPropsParams): {
     refreshStory,
     undo,
     redo,
-    canUndo,
-    canRedo,
     searchState,
     currentChapter,
     isChapterLoading,
@@ -464,11 +469,14 @@ export function useAppMainLayoutProps(params: UseAppMainLayoutPropsParams): {
     ]
   );
   const editorUpdateChapter = useCallback(
-    (id: string, partial: Record<string, unknown>) => {
+    (id: string, partial: Record<string, unknown>, isUndoRedo?: boolean) => {
       if ('content' in partial) {
         searchStateRef.current.notifyContentChanged(Number.parseInt(id, 10));
       }
-      return updateChapter(id, partial);
+      if (isUndoRedo) {
+        return updateChapter(id, partial, true, false, false);
+      }
+      return updateChapter(id, partial, true, true, true);
     },
     [updateChapter]
   );

src/frontend/features/chapters/ChapterList.tsx

@@ -433,8 +433,8 @@ export const ChapterList: React.FC<ChapterListProps> = React.memo(
           }`}
         >
           <button
-            className="flex flex-col w-full text-left cursor-row-resize"
-            style={{ cursor: 'row-resize' }}
+            type="button"
+            className="flex flex-col w-full text-left cursor-pointer"
             draggable
             onDragStart={(e: React.DragEvent<HTMLButtonElement>) =>
               handleDragStart(e, 'chapter', chapter.id, index, chapter.book_id)
@@ -466,6 +466,9 @@ export const ChapterList: React.FC<ChapterListProps> = React.memo(
                 )}
               </div>
             </div>
+            <div className="mt-2 text-xs text-brand-gray-500 line-clamp-2">
+              {renderSummary()}
+            </div>
           </button>
           <div className="absolute top-2 right-2 flex items-center opacity-0 group-hover:opacity-100 transition-opacity">
             <button
@@ -488,9 +491,6 @@ export const ChapterList: React.FC<ChapterListProps> = React.memo(
               <Trash2 size={14} />
             </button>
           </div>
-          <p className="text-xs text-brand-gray-500 line-clamp-2 pointer-events-none">
-            {renderSummary()}
-          </p>
         </div>
       );
     };

src/frontend/features/editor/Editor.sync.test.tsx

@@ -117,6 +117,33 @@ describe('Editor diff highlighting', () => {
     expect(cmContent?.innerHTML).not.toContain('diff-inserted');
   });
 
+  it('resets diff baseline when switching to a new chapter with no baseline', async () => {
+    const firstChapter = { ...mockChapter, content: 'Original content with AI' };
+    const secondChapter = {
+      ...mockChapter,
+      id: '2',
+      title: 'Chapter 2',
+      content: 'Second chapter text',
+    };
+
+    const { rerender } = render(
+      <Editor
+        {...defaultProps}
+        chapter={firstChapter}
+        baselineContent="Original content"
+      />
+    );
+
+    await act(async () => {
+      rerender(
+        <Editor {...defaultProps} chapter={secondChapter} baselineContent={undefined} />
+      );
+    });
+
+    const cmContent = document.querySelector('.cm-content');
+    expect(cmContent?.innerHTML).not.toContain('diff-inserted');
+  });
+
   it('shows streaming content from store slot with correct diff during streaming', async () => {
     const { rerender } = render(<Editor {...defaultProps} />);
 

src/frontend/features/editor/Editor.tsx

@@ -55,7 +55,7 @@ interface EditorProps {
   viewMode: ViewMode;
   showWhitespace?: boolean;
   onToggleShowWhitespace?: () => void;
-  onChange: (id: string, updates: Partial<WritingUnit>) => void;
+  onChange: (id: string, updates: Partial<WritingUnit>, isUndoRedo?: boolean) => void;
   baselineContent?: string;
   language?: string;
   spellCheck?: boolean;
@@ -153,6 +153,22 @@ export const Editor = React.memo(
       const prevBaselineRef = useRef<string | undefined>(baselineContent);
       // Keep the last non-undefined baseline so undo can restore the diff view.
       const savedBaselineRef = useRef<string | undefined>(baselineContent);
+      const lastChapterIdRef = useRef(chapter.id);
+
+      useEffect(() => {
+        const isChapterSwitch = chapter.id !== lastChapterIdRef.current;
+        if (!isChapterSwitch) return;
+
+        lastChapterIdRef.current = chapter.id;
+        prevBaselineRef.current = baselineContent;
+        setLocalBaseline(baselineContent);
+        if (baselineContent !== undefined && baselineContent !== chapter.content) {
+          savedBaselineRef.current = baselineContent;
+        } else if (baselineContent === undefined) {
+          savedBaselineRef.current = undefined;
+        }
+      }, [chapter.id, baselineContent, chapter.content]);
+
       if (baselineContent !== prevBaselineRef.current) {
         prevBaselineRef.current = baselineContent;
         setLocalBaseline(baselineContent);
@@ -181,7 +197,6 @@ export const Editor = React.memo(
       // switch, AI update, undo/redo).  Use chapter.id as the primary trigger
       // for chapter switches; also watch chapter.content so AI insertions and
       // undo/redo (which can change content without changing id) are reflected.
-      const lastChapterIdRef = useRef(chapter.id);
       useEffect(() => {
         const isChapterSwitch = chapter.id !== lastChapterIdRef.current;
         lastChapterIdRef.current = chapter.id;
@@ -764,10 +779,11 @@ export const Editor = React.memo(
                           setLocalBaseline(undefined);
                         }
                         scheduleCheckContext();
-                        if (contentDebounceRef.current)
+                        if (contentDebounceRef.current) {
                           clearTimeout(contentDebounceRef.current);
+                        }
                         contentDebounceRef.current = setTimeout(() => {
-                          onChange(chapter.id, { content: val });
+                          onChange(chapter.id, { content: val }, isUndoRedo);
                         }, DEBOUNCE_MS);
                       }}
                       onSelectionChange={scheduleCheckContext}

src/frontend/features/layout/layoutControlTypes.ts

@@ -124,7 +124,13 @@ export type MainSidebarControls = {
   currentChapterId: string | null;
   handleChapterSelect: (id: string | null) => void;
   deleteChapter: (id: string) => Promise<void>;
-  updateChapter: (id: string, partial: Partial<Chapter>) => Promise<void>;
+  updateChapter: (
+    id: string,
+    partial: Partial<Chapter>,
+    sync?: boolean,
+    pushHistory?: boolean,
+    isUserEdit?: boolean
+  ) => Promise<void>;
   updateBook: (
     id: string,
     partial: { title?: string; summary?: string }
@@ -223,7 +229,13 @@ export type MainEditorControls = {
     v: EditorSettings | ((prev: EditorSettings) => EditorSettings)
   ) => void;
   viewMode: ViewMode;
-  updateChapter: (id: string, partial: Partial<WritingUnit>) => Promise<void>;
+  updateChapter: (
+    id: string,
+    partial: Partial<WritingUnit>,
+    sync?: boolean,
+    pushHistory?: boolean,
+    isUserEdit?: boolean
+  ) => Promise<void>;
   suggestionControls: MainEditorSuggestionControls;
   aiControls: MainEditorAiControls;
   setActiveFormats: (v: string[]) => void;