From a863dcc11de0194ca2edd8db0b405d7395776f51 Mon Sep 17 00:00:00 2001
From: DhanushSantosh <dhanushsantoshs05@gmail.com>
Date: Tue, 20 Jan 2026 19:50:15 +0530
Subject: [PATCH] fix(ui): handle review feedback

---
 apps/ui/src/components/views/running-agents-view.tsx |  9 +++++++--
 apps/ui/src/hooks/use-project-settings-loader.ts     | 12 ++++++++----
 2 files changed, 15 insertions(+), 6 deletions(-)

diff --git a/apps/ui/src/components/views/running-agents-view.tsx b/apps/ui/src/components/views/running-agents-view.tsx
index faa23979..4265650b 100644
--- a/apps/ui/src/components/views/running-agents-view.tsx
+++ b/apps/ui/src/components/views/running-agents-view.tsx
@@ -44,8 +44,13 @@ export function RunningAgentsView() {
       const isBacklogPlan = agent.featureId.startsWith('backlog-plan:');
       if (isBacklogPlan && api.backlogPlan) {
         logger.debug('Stopping backlog plan agent', { featureId: agent.featureId });
-        await api.backlogPlan.stop();
-        refetch();
+        try {
+          await api.backlogPlan.stop();
+        } catch (error) {
+          logger.error('Failed to stop backlog plan', { featureId: agent.featureId, error });
+        } finally {
+          refetch();
+        }
         return;
       }
       // Use mutation for regular features
diff --git a/apps/ui/src/hooks/use-project-settings-loader.ts b/apps/ui/src/hooks/use-project-settings-loader.ts
index de8d70f2..a4531d22 100644
--- a/apps/ui/src/hooks/use-project-settings-loader.ts
+++ b/apps/ui/src/hooks/use-project-settings-loader.ts
@@ -27,10 +27,10 @@ export function useProjectSettingsLoader() {
   );
   const setCurrentProject = useAppStore((state) => state.setCurrentProject);
 
-  const appliedProjectRef = useRef<string | null>(null);
+  const appliedProjectRef = useRef<{ path: string; dataUpdatedAt: number } | null>(null);
 
   // Fetch project settings with React Query
-  const { data: settings } = useProjectSettings(currentProject?.path);
+  const { data: settings, dataUpdatedAt } = useProjectSettings(currentProject?.path);
 
   // Apply settings when data changes
   useEffect(() => {
@@ -39,11 +39,14 @@ export function useProjectSettingsLoader() {
     }
 
     // Prevent applying the same settings multiple times
-    if (appliedProjectRef.current === currentProject.path) {
+    if (
+      appliedProjectRef.current?.path === currentProject.path &&
+      appliedProjectRef.current?.dataUpdatedAt === dataUpdatedAt
+    ) {
       return;
     }
 
-    appliedProjectRef.current = currentProject.path;
+    appliedProjectRef.current = { path: currentProject.path, dataUpdatedAt };
     const projectPath = currentProject.path;
 
     const bg = settings.boardBackground;
@@ -109,6 +112,7 @@ export function useProjectSettingsLoader() {
   }, [
     currentProject?.path,
     settings,
+    dataUpdatedAt,
     setBoardBackground,
     setCardOpacity,
     setColumnOpacity,