zen-gitsync 2.0.8 → 2.1.0

package/src/ui/server/index.js

@@ -659,7 +659,22 @@ async function startUIServer() {
       const { stdout } = await execGitCommand('git pull');
       res.json({ success: true, message: stdout });
     } catch (error) {
-      res.status(500).json({ success: false, error: error.message });
+      // 改进错误处理，检查是否需要合并
+      const errorMsg = error.message || '';
+      const needsMerge = errorMsg.includes('merge') || 
+                         errorMsg.includes('需要合并') || 
+                         errorMsg.includes('CONFLICT') ||
+                         errorMsg.includes('冲突');
+      
+      // 返回更详细的错误信息和标记
+      res.status(500).json({ 
+        success: false, 
+        error: error.message,
+        needsMerge: needsMerge,
+        // 包含完整的错误输出
+        fullError: error.stderr || error.message,
+        pullOutput: error.stdout || ''
+      });
     }
   });
   
@@ -1322,9 +1337,7 @@ async function startUIServer() {
       console.log(`初始化文件系统监控器，路径: ${currentDir}`);
       
       // 检查是否是Git仓库
-      try {
-        execGitCommand('git rev-parse --is-inside-work-tree');
-      } catch (error) {
+      if (!isGitRepo) {
         console.log('当前目录不是Git仓库，不启动监控');
         return;
       }
@@ -1366,6 +1379,17 @@ async function startUIServer() {
   // 获取并广播Git状态
   async function getAndBroadcastStatus() {
     try {
+      // 如果不是Git仓库，发送特殊状态
+      if (!isGitRepo) {
+        io.emit('git_status_update', { 
+          isGitRepo: false,
+          status: '当前目录不是Git仓库',
+          porcelain: '',
+          timestamp: new Date().toISOString()
+        });
+        return;
+      }
+      
       // 获取常规状态
       const { stdout: statusOutput } = await execGitCommand('git status');
       
@@ -1374,6 +1398,7 @@ async function startUIServer() {
       
       // 广播到所有连接的客户端
       io.emit('git_status_update', { 
+        isGitRepo: true,
         status: statusOutput,
         porcelain: porcelainOutput,
         timestamp: new Date().toISOString()
@@ -1396,6 +1421,19 @@ async function startUIServer() {
     }, DEBOUNCE_DELAY);
   }
   
+  // 检查当前目录是否是Git仓库
+  let isGitRepo = false;
+  try {
+    const { stdout } = await execGitCommand('git rev-parse --is-inside-work-tree', { log: false });
+    isGitRepo = stdout.trim() === 'true';
+  } catch (error) {
+    isGitRepo = false;
+    console.log(chalk.yellow('======================================'));
+    console.log(chalk.yellow(`  提示: 当前目录不是Git仓库`));
+    console.log(chalk.yellow(`  目录: ${process.cwd()}`));
+    console.log(chalk.yellow('======================================'));
+  }
+  
   // 启动服务器
   const PORT = 3000;
   httpServer.listen(PORT, () => {
@@ -1403,11 +1441,15 @@ async function startUIServer() {
     console.log(chalk.green(`  Zen GitSync 服务器已启动`));
     console.log(chalk.green(`  访问地址: http://localhost:${PORT}`));
     console.log(chalk.green(`  启动时间: ${new Date().toLocaleString()}`));
+    if (isGitRepo) {
+      console.log(chalk.green(`  当前目录是Git仓库，文件监控已启动`));
+      // 启动文件监控
+      initFileSystemWatcher();
+    } else {
+      console.log(chalk.yellow(`  当前目录不是Git仓库，文件监控未启动`));
+    }
     console.log(chalk.green('======================================'));
     
-    // 启动文件监控
-    initFileSystemWatcher();
-    
     open(`http://localhost:${PORT}`);
   }).on('error', async (err) => {
     if (err.code === 'EADDRINUSE') {
@@ -1422,36 +1464,19 @@ async function startUIServer() {
               console.log(chalk.green(`  访问地址: http://localhost:${newPort}`));
               console.log(chalk.green(`  启动时间: ${new Date().toLocaleString()}`));
               console.log(chalk.green('======================================'));
-              
-              // 启动文件监控
-              initFileSystemWatcher();
-              
-              open(`http://localhost:${newPort}`);
               resolve();
-            }).on('error', (e) => {
-              if (e.code === 'EADDRINUSE') {
-                console.log(`端口 ${newPort} 也被占用，继续尝试...`);
-                newPort++;
-                reject(e);
-              } else {
-                reject(e);
-              }
             });
           });
           break;
-        } catch (e) {
-          if (newPort >= PORT + 100) {
-            console.error('无法找到可用端口，请手动指定端口');
-            process.exit(1);
-          }
+        } catch (error) {
+          newPort++;
         }
       }
     } else {
-      console.error('服务器启动失败:', err);
+      console.error('启动服务器失败:', err);
       process.exit(1);
     }
   });
 }
 
-export default startUIServer;
-
+export default startUIServer;