From ed8596fc7e002bcec6851e328384dec03236b7ff Mon Sep 17 00:00:00 2001 From: Willie Date: Fri, 20 Mar 2026 11:07:38 +0800 Subject: [PATCH] fix(server): fix extras sync response key and add read lock - Change JSON key from 'results' to 'extras' to match frontend type - Add RLock snapshot pattern matching handleExtras GET handler - Replace s.extrasSourceDir() with inline resolution using snapshotted values --- internal/server/handler_extras.go | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/internal/server/handler_extras.go b/internal/server/handler_extras.go index 146b04192..5455e37e6 100644 --- a/internal/server/handler_extras.go +++ b/internal/server/handler_extras.go @@ -348,7 +348,12 @@ func (s *Server) handleExtrasSync(w http.ResponseWriter, r *http.Request) { return } + s.mu.RLock() extras := s.extrasConfig() + projectRoot := s.projectRoot + source := s.cfg.Source + extrasSource := s.cfg.ExtrasSource + s.mu.RUnlock() type targetSyncResult struct { Target string `json:"target"` @@ -371,7 +376,12 @@ func (s *Server) handleExtrasSync(w http.ResponseWriter, r *http.Request) { continue } - sourceDir := s.extrasSourceDir(extra) + var sourceDir string + if projectRoot != "" { + sourceDir = config.ExtrasSourceDirProject(projectRoot, extra.Name) + } else { + sourceDir = config.ResolveExtrasSourceDir(extra, extrasSource, source) + } // Auto-create source directory if it doesn't exist if _, statErr := os.Stat(sourceDir); os.IsNotExist(statErr) { @@ -424,7 +434,7 @@ func (s *Server) handleExtrasSync(w http.ResponseWriter, r *http.Request) { "scope": "ui", }, "") - writeJSON(w, map[string]any{"results": results}) + writeJSON(w, map[string]any{"extras": results}) } // handleExtrasMode — PATCH /api/extras/{name}/mode