diff --git a/frontend/src/components/chat/code-engine/code-engine.tsx b/frontend/src/components/chat/code-engine/code-engine.tsx
index 71de736d..8001473e 100644
--- a/frontend/src/components/chat/code-engine/code-engine.tsx
+++ b/frontend/src/components/chat/code-engine/code-engine.tsx
@@ -37,17 +37,16 @@ export function CodeEngine({
   >({});
   const projectPathRef = useRef(null);
 
-  const [progress, setProgress] = useState(0); // 从0%开始
-  const [estimateTime, setEstimateTime] = useState(6 * 60); // 保留估计时间
+  const [progress, setProgress] = useState(0);
+  const [estimateTime, setEstimateTime] = useState(6 * 60);
   const [timerActive, setTimerActive] = useState(false);
-  const initialTime = 6 * 60; // 初始总时间（6分钟）
+  const initialTime = 6 * 60; // start with 6 minutes
   const [projectCompleted, setProjectCompleted] = useState(false);
-  // 添加一个状态来跟踪完成动画
   const [isCompleting, setIsCompleting] = useState(false);
-  // 添加一个ref来持久跟踪项目状态，避免重新渲染时丢失
+  // add a ref to track if project is loaded
   const isProjectLoadedRef = useRef(false);
 
-  // 在组件挂载时从localStorage检查项目是否已完成
+  // Load project completion status from local storage
   useEffect(() => {
     try {
       const savedCompletion = localStorage.getItem(
@@ -59,13 +58,13 @@ export function CodeEngine({
         setProgress(100);
       }
     } catch (e) {
-      // 忽略localStorage错误
+      logger.error('Failed to load project completion status:', e);
     }
   }, [chatId]);
 
   // Poll for project if needed using chatId
   useEffect(() => {
-    // 如果项目已经完成，跳过轮询
+    // if project is already completed or project is already loaded, return
     if (projectCompleted || isProjectLoadedRef.current) {
       return;
     }
@@ -76,11 +75,14 @@ export function CodeEngine({
           setIsLoading(true);
           const project = await pollChatProject(chatId);
           if (project) {
-            setLocalProject(project);
-            // 如果成功加载项目，将状态设置为已完成
+            // if projectPath is present, set local project and fetch files
             if (project.projectPath) {
+              setLocalProject(project);
               setProjectCompleted(true);
               isProjectLoadedRef.current = true;
+              fetchFiles();
+            } else {
+              setLocalProject(project);
             }
           }
         } catch (error) {
@@ -313,7 +315,7 @@ export function CodeEngine({
 
   // Determine if we're truly ready to render
   const showLoader = useMemo(() => {
-    // 如果项目已经被标记为完成，不再显示加载器
+    // if project is already completed or project is already loaded, return
     if (projectCompleted || isProjectLoadedRef.current) {
       return false;
     }
@@ -340,26 +342,25 @@ export function CodeEngine({
           setTimerActive(false);
           setIsCompleting(false);
           setProjectCompleted(true);
-          // 同时更新ref以持久记住完成状态
           isProjectLoadedRef.current = true;
-
-          // 可选：在完成时将状态保存到localStorage
           try {
             localStorage.setItem(`project-completed-${chatId}`, 'true');
           } catch (e) {
-            // 忽略localStorage错误
+            logger.error('Failed to save project completion status:', e);
           }
         }, 800);
       }, 500);
 
       return () => clearTimeout(completionTimer);
-    } else if (
+    }
+    if (
       showLoader &&
       !timerActive &&
       !projectCompleted &&
-      !isProjectLoadedRef.current
+      !isProjectLoadedRef.current &&
+      estimateTime > 1
     ) {
-      // 只有在项目未被标记为完成时才重置
+      // if project is not loaded and timer is not active, start timer
       setTimerActive(true);
       setEstimateTime(initialTime);
       setProgress(0);
@@ -374,8 +375,9 @@ export function CodeEngine({
       interval = setInterval(() => {
         setEstimateTime((prevTime) => {
           if (prevTime <= 1) {
-            return initialTime;
+            return 1;
           }
+
           const elapsedTime = initialTime - prevTime + 1;
           const newProgress = Math.min(
             Math.floor((elapsedTime / initialTime) * 100),
@@ -464,9 +466,13 @@ export function CodeEngine({
                     }}
                   />
                 </div>
+                {estimateTime <= 1 && !projectCompleted && (
+                  <p className="text-sm text-muted-foreground mt-1">
+                    Hang tight, almost there...
+                  </p>
+                )}
               </div>
 
-              {/* 添加不同阶段的消息 */}
               <motion.p
                 initial={{ opacity: 0 }}
                 animate={{ opacity: 1 }}