perf: 拆分规划策略

2026-03-13 00:19:21 +08:00
parent 16e790a372
commit 7488198461
24 changed files with 1543 additions and 487 deletions
--- a/state/progress.go
+++ b/state/progress.go
@@ -10,8 +10,14 @@ import (

 // LoadProgress 读取 meta/progress.json。不存在时返回 nil。
 func (s *Store) LoadProgress() (*domain.Progress, error) {
+	s.mu.RLock()
+	defer s.mu.RUnlock()
+	return s.loadProgressUnlocked()
+}
+
+func (s *Store) loadProgressUnlocked() (*domain.Progress, error) {
 	var p domain.Progress
-	if err := s.readJSON("meta/progress.json", &p); err != nil {
+	if err := s.readJSONUnlocked("meta/progress.json", &p); err != nil {
 		if os.IsNotExist(err) {
 			return nil, nil
 		}
@@ -22,7 +28,13 @@ func (s *Store) LoadProgress() (*domain.Progress, error) {

 // SaveProgress 保存进度到 meta/progress.json。
 func (s *Store) SaveProgress(p *domain.Progress) error {
-	return s.writeJSON("meta/progress.json", p)
+	s.mu.Lock()
+	defer s.mu.Unlock()
+	return s.saveProgressUnlocked(p)
+}
+
+func (s *Store) saveProgressUnlocked(p *domain.Progress) error {
+	return s.writeJSONUnlocked("meta/progress.json", p)
 }

 // InitProgress 创建初始进度。
@@ -36,84 +48,90 @@ func (s *Store) InitProgress(novelName string, totalChapters int) error {

 // SetTotalChapters 根据大纲长度设定总章节数。
 func (s *Store) SetTotalChapters(n int) error {
-	p, err := s.LoadProgress()
-	if err != nil {
-		return err
-	}
-	if p == nil {
-		p = &domain.Progress{}
-	}
-	p.TotalChapters = n
-	return s.SaveProgress(p)
+	return s.withWriteLock(func() error {
+		p, err := s.loadProgressUnlocked()
+		if err != nil {
+			return err
+		}
+		if p == nil {
+			p = &domain.Progress{}
+		}
+		p.TotalChapters = n
+		return s.saveProgressUnlocked(p)
+	})
 }

 // UpdatePhase 更新创作阶段。
 func (s *Store) UpdatePhase(phase domain.Phase) error {
-	p, err := s.LoadProgress()
-	if err != nil {
-		return err
-	}
-	if p == nil {
-		p = &domain.Progress{}
-	}
-	p.Phase = phase
-	return s.SaveProgress(p)
+	return s.withWriteLock(func() error {
+		p, err := s.loadProgressUnlocked()
+		if err != nil {
+			return err
+		}
+		if p == nil {
+			p = &domain.Progress{}
+		}
+		p.Phase = phase
+		return s.saveProgressUnlocked(p)
+	})
 }

 // MarkChapterComplete 标记章节完成，原子性更新进度。
 // 支持重写场景：如果章节已完成，先减去旧字数再加新字数。
 // hookType 和 dominantStrand 用于节奏追踪，可为空。
 func (s *Store) MarkChapterComplete(chapter, wordCount int, hookType, dominantStrand string) error {
-	p, err := s.LoadProgress()
-	if err != nil {
-		return err
-	}
-	if p == nil {
-		return fmt.Errorf("progress not initialized, call InitProgress first")
-	}
-	if p.ChapterWordCounts == nil {
-		p.ChapterWordCounts = make(map[int]int)
-	}
-	// 重写场景：减去旧字数
-	if oldWC, ok := p.ChapterWordCounts[chapter]; ok {
-		p.TotalWordCount -= oldWC
-	}
-	p.ChapterWordCounts[chapter] = wordCount
-	p.TotalWordCount += wordCount
-	if !slices.Contains(p.CompletedChapters, chapter) {
-		p.CompletedChapters = append(p.CompletedChapters, chapter)
-	}
-	// 仅在正常推进时更新 CurrentChapter，重写旧章节不回退指针
-	if chapter+1 > p.CurrentChapter {
-		p.CurrentChapter = chapter + 1
-	}
-	p.InProgressChapter = 0
-	p.CompletedScenes = nil
-	p.Phase = domain.PhaseWriting
+	return s.withWriteLock(func() error {
+		p, err := s.loadProgressUnlocked()
+		if err != nil {
+			return err
+		}
+		if p == nil {
+			return fmt.Errorf("progress not initialized, call InitProgress first")
+		}
+		if p.ChapterWordCounts == nil {
+			p.ChapterWordCounts = make(map[int]int)
+		}
+		// 重写场景：减去旧字数
+		if oldWC, ok := p.ChapterWordCounts[chapter]; ok {
+			p.TotalWordCount -= oldWC
+		}
+		p.ChapterWordCounts[chapter] = wordCount
+		p.TotalWordCount += wordCount
+		if !slices.Contains(p.CompletedChapters, chapter) {
+			p.CompletedChapters = append(p.CompletedChapters, chapter)
+		}
+		// 仅在正常推进时更新 CurrentChapter，重写旧章节不回退指针
+		if chapter+1 > p.CurrentChapter {
+			p.CurrentChapter = chapter + 1
+		}
+		p.InProgressChapter = 0
+		p.CompletedScenes = nil
+		p.Phase = domain.PhaseWriting

-	// 节奏追踪：按章节顺序填充 history（确保索引对齐）
-	if dominantStrand != "" {
-		for len(p.StrandHistory) < chapter-1 {
-			p.StrandHistory = append(p.StrandHistory, "")
+		// 节奏追踪：按章节顺序填充 history（确保索引对齐）
+		if dominantStrand != "" {
+			for len(p.StrandHistory) < chapter-1 {
+				p.StrandHistory = append(p.StrandHistory, "")
+			}
+			if len(p.StrandHistory) < chapter {
+				p.StrandHistory = append(p.StrandHistory, dominantStrand)
+			} else {
+				p.StrandHistory[chapter-1] = dominantStrand
+			}
 		}
-		if len(p.StrandHistory) < chapter {
-			p.StrandHistory = append(p.StrandHistory, dominantStrand)
-		} else {
-			p.StrandHistory[chapter-1] = dominantStrand
+		if hookType != "" {
+			for len(p.HookHistory) < chapter-1 {
+				p.HookHistory = append(p.HookHistory, "")
+			}
+			if len(p.HookHistory) < chapter {
+				p.HookHistory = append(p.HookHistory, hookType)
+			} else {
+				p.HookHistory[chapter-1] = hookType
+			}
 		}
-	}
-	if hookType != "" {
-		for len(p.HookHistory) < chapter-1 {
-			p.HookHistory = append(p.HookHistory, "")
-		}
-		if len(p.HookHistory) < chapter {
-			p.HookHistory = append(p.HookHistory, hookType)
-		} else {
-			p.HookHistory[chapter-1] = hookType
-		}
-	}

-	return s.SaveProgress(p)
+		return s.saveProgressUnlocked(p)
+	})
 }

 // MarkComplete 标记全书创作完成。
@@ -142,36 +160,40 @@ func (s *Store) LoadLastCommit() (*domain.CommitResult, error) {
 // MarkSceneComplete 标记场景完成，用于场景级 checkpoint。
 // 切换到不同章节时自动清空旧的 CompletedScenes。
 func (s *Store) MarkSceneComplete(chapter, scene int) error {
-	p, err := s.LoadProgress()
-	if err != nil {
-		return err
-	}
-	if p == nil {
-		return fmt.Errorf("progress not initialized, call InitProgress first")
-	}
-	// 章节切换：清空旧场景列表
-	if p.InProgressChapter != chapter {
-		p.CompletedScenes = nil
-	}
-	p.InProgressChapter = chapter
-	if !slices.Contains(p.CompletedScenes, scene) {
-		p.CompletedScenes = append(p.CompletedScenes, scene)
-	}
-	return s.SaveProgress(p)
+	return s.withWriteLock(func() error {
+		p, err := s.loadProgressUnlocked()
+		if err != nil {
+			return err
+		}
+		if p == nil {
+			return fmt.Errorf("progress not initialized, call InitProgress first")
+		}
+		// 章节切换：清空旧场景列表
+		if p.InProgressChapter != chapter {
+			p.CompletedScenes = nil
+		}
+		p.InProgressChapter = chapter
+		if !slices.Contains(p.CompletedScenes, scene) {
+			p.CompletedScenes = append(p.CompletedScenes, scene)
+		}
+		return s.saveProgressUnlocked(p)
+	})
 }

 // ClearInProgress 清除场景级进度状态（章节提交后调用）。
 func (s *Store) ClearInProgress() error {
-	p, err := s.LoadProgress()
-	if err != nil {
-		return err
-	}
-	if p == nil {
-		return nil
-	}
-	p.InProgressChapter = 0
-	p.CompletedScenes = nil
-	return s.SaveProgress(p)
+	return s.withWriteLock(func() error {
+		p, err := s.loadProgressUnlocked()
+		if err != nil {
+			return err
+		}
+		if p == nil {
+			return nil
+		}
+		p.InProgressChapter = 0
+		p.CompletedScenes = nil
+		return s.saveProgressUnlocked(p)
+	})
 }

 // ClearLastCommit 清除 commit 信号文件，防止重复消费。
@@ -181,95 +203,107 @@ func (s *Store) ClearLastCommit() error {

 // UpdateVolumeArc 更新当前卷弧位置。
 func (s *Store) UpdateVolumeArc(volume, arc int) error {
-	p, err := s.LoadProgress()
-	if err != nil {
-		return err
-	}
-	if p == nil {
-		return nil
-	}
-	p.CurrentVolume = volume
-	p.CurrentArc = arc
-	return s.SaveProgress(p)
+	return s.withWriteLock(func() error {
+		p, err := s.loadProgressUnlocked()
+		if err != nil {
+			return err
+		}
+		if p == nil {
+			return nil
+		}
+		p.CurrentVolume = volume
+		p.CurrentArc = arc
+		return s.saveProgressUnlocked(p)
+	})
 }

 // SetLayered 设置分层模式标志。
 func (s *Store) SetLayered(layered bool) error {
-	p, err := s.LoadProgress()
-	if err != nil {
-		return err
-	}
-	if p == nil {
-		return nil
-	}
-	p.Layered = layered
-	return s.SaveProgress(p)
+	return s.withWriteLock(func() error {
+		p, err := s.loadProgressUnlocked()
+		if err != nil {
+			return err
+		}
+		if p == nil {
+			return nil
+		}
+		p.Layered = layered
+		return s.saveProgressUnlocked(p)
+	})
 }

 // SetFlow 更新当前流程状态。
 func (s *Store) SetFlow(flow domain.FlowState) error {
-	p, err := s.LoadProgress()
-	if err != nil {
-		return err
-	}
-	if p == nil {
-		return nil
-	}
-	p.Flow = flow
-	return s.SaveProgress(p)
+	return s.withWriteLock(func() error {
+		p, err := s.loadProgressUnlocked()
+		if err != nil {
+			return err
+		}
+		if p == nil {
+			return nil
+		}
+		p.Flow = flow
+		return s.saveProgressUnlocked(p)
+	})
 }

 // SetPendingRewrites 设置待重写章节队列和原因。
 func (s *Store) SetPendingRewrites(chapters []int, reason string) error {
-	p, err := s.LoadProgress()
-	if err != nil {
-		return err
-	}
-	if p == nil {
-		return nil
-	}
-	p.PendingRewrites = chapters
-	p.RewriteReason = reason
-	return s.SaveProgress(p)
+	return s.withWriteLock(func() error {
+		p, err := s.loadProgressUnlocked()
+		if err != nil {
+			return err
+		}
+		if p == nil {
+			return nil
+		}
+		p.PendingRewrites = chapters
+		p.RewriteReason = reason
+		return s.saveProgressUnlocked(p)
+	})
 }

 // CompleteRewrite 从待重写队列中移除已完成的章节。
 // 队列清空时自动将 Flow 重置为 writing 并清除 RewriteReason。
 func (s *Store) CompleteRewrite(chapter int) error {
-	p, err := s.LoadProgress()
-	if err != nil {
-		return err
-	}
-	if p == nil {
-		return nil
-	}
-	var remaining []int
-	for _, ch := range p.PendingRewrites {
-		if ch != chapter {
-			remaining = append(remaining, ch)
+	return s.withWriteLock(func() error {
+		p, err := s.loadProgressUnlocked()
+		if err != nil {
+			return err
 		}
-	}
-	p.PendingRewrites = remaining
-	if len(remaining) == 0 {
-		p.Flow = domain.FlowWriting
-		p.RewriteReason = ""
-	}
-	return s.SaveProgress(p)
+		if p == nil {
+			return nil
+		}
+		var remaining []int
+		for _, ch := range p.PendingRewrites {
+			if ch != chapter {
+				remaining = append(remaining, ch)
+			}
+		}
+		p.PendingRewrites = remaining
+		if len(remaining) == 0 {
+			p.Flow = domain.FlowWriting
+			p.RewriteReason = ""
+		}
+		return s.saveProgressUnlocked(p)
+	})
 }

 // ClearPendingRewrites 强制清空重写队列。
 func (s *Store) ClearPendingRewrites() error {
-	p, err := s.LoadProgress()
-	if err != nil {
-		return err
-	}
-	if p == nil {
-		return nil
-	}
-	p.PendingRewrites = nil
-	p.RewriteReason = ""
-	p.Flow = domain.FlowWriting
-	return s.SaveProgress(p)
+	return s.withWriteLock(func() error {
+		p, err := s.loadProgressUnlocked()
+		if err != nil {
+			return err
+		}
+		if p == nil {
+			return nil
+		}
+		p.PendingRewrites = nil
+		p.RewriteReason = ""
+		p.Flow = domain.FlowWriting
+		return s.saveProgressUnlocked(p)
+	})
 }

 // ValidateChapterCommit 校验当前章节是否允许提交。