zen-gitsync 2.12.2 → 2.12.3

package/src/ui/server/index.js

@@ -1,396 +1,410 @@
-import express from 'express';
-import { createServer } from 'http';
-import { fileURLToPath } from 'url';
-import path from 'path';
-import { execGitCommand, getCommandHistory, addCommandToHistory, clearCommandHistory, registerSocketIO, execGitAddWithLockFilter, checkAndClearGitLock } from '../../utils/index.js';
-import open from 'open';
-import config from '../../config.js';
-import chalk from 'chalk';
-import fs from 'fs/promises';
-import fsSync from 'fs';
-import os from 'os';
-import { Server } from 'socket.io';
-import { spawn, exec } from 'child_process';
-import iconv from 'iconv-lite';
-import { createRequestLogger } from './middleware/requestLogger.js';
-import { registerUiSocketHandlers } from './socket/registerUiSocketHandlers.js';
-import { registerExecRoutes } from './routes/exec.js';
-import { registerTerminalRoutes } from './routes/terminal.js';
-import { registerProcessRoutes } from './routes/process.js';
-import { registerStatusRoutes } from './routes/status.js';
-import { registerBranchStatusRoutes } from './routes/branchStatus.js';
-import { registerConfigRoutes } from './routes/config.js';
-import { registerGitRoutes } from './routes/git.js';
-import { registerFsRoutes } from './routes/fs.js';
-import { registerNpmRoutes } from './routes/npm.js';
-import { registerFileOpenRoutes } from './routes/fileOpen.js';
-import { registerGitOpsRoutes } from './routes/gitOps.js';
-import { registerCodeRoutes } from './routes/code.js';
-import { registerCodeAnalysisRoutes } from './routes/codeAnalysis.js';
-import { registerInstancesRoutes } from './routes/instances.js';
-import { createInstanceRegistry } from './utils/instanceRegistry.js';
-import { createSavePortToFile } from './utils/createSavePortToFile.js';
-import { startServerOnAvailablePort } from './utils/startServerOnAvailablePort.js';
-import { resolveStartPort } from './utils/randomStartPort.js';
-import { createFilePickerMiddleware } from 'local-file-picker';
-import { createAiModelMiddleware } from 'ai-model-form';
-
-const __filename = fileURLToPath(import.meta.url);
-const __dirname = path.dirname(__filename);
-const configManager = config; // 确保 configManager 可用
-// 存储正在运行的进程（用于停止功能）
-const runningProcesses = new Map(); // key: processId, value: { childProcess, command, startTime }
-let processIdCounter = 0;
-
-const terminalSessions = new Map(); // key: terminalSessionId, value: { id, command, workingDirectory, pid, createdAt, lastStartedAt }
-let terminalSessionIdCounter = 0;
-
-// 分支状态缓存
-let branchStatusCache = {
-  currentBranch: null,
-  upstreamBranch: null,
-  lastUpdate: 0,
-  cacheTimeout: 5000 // 5秒缓存
-};
-
-// 推送状态标记 - 用于优化推送后的分支状态查询
-let recentPushStatus = {
-  justPushed: false,
-  pushTime: 0,
-  validDuration: 10000 // 推送后10秒内认为分支状态是同步的
-};
-
-const showConsole = true;
-async function startUIServer(noOpen = false, savePort = false) {
-  const app = express();
-  const httpServer = createServer(app);
-  const io = new Server(httpServer);
-  if (showConsole) console.log(`创建服务成功`)
-  
-  // 获取当前项目的唯一标识（使用工作目录路径）
-  // 需要在切换目录时更新，故使用 let
-  let currentProjectPath = process.cwd();
-  let projectRoomId = `project:${currentProjectPath.replace(/[\\/:\s]/g, '_')}`;
-  
-  console.log(chalk.blue(`项目房间ID: ${projectRoomId}`));
-  console.log(chalk.blue(`项目路径: ${currentProjectPath}`));
-  
-  // 注册Socket.io实例，用于命令历史通知
-  registerSocketIO(io);
-
-  // 构建实例注册表（用于跨进程共享"当前运行中的 GUI"信息）
-  // 注册表文件位于用户主目录，所有 g ui 进程共享写入
-  const instanceRegistry = createInstanceRegistry({
-    fs,
-    path,
-    os,
-    registryPath: path.join(os.homedir(), '.zen-gitsync-instances.json')
-  });
-
-  // 添加全局中间件来解析JSON请求体
-  app.use(express.json());
-
-  // 记录最近打开的目录（优先 Git 根目录，其次当前工作目录）
-  try {
-    let dirPath = process.cwd();
-    try {
-      if(showConsole) console.log(`记录最近打开目录`)
-      const { stdout } = await execGitCommand('git rev-parse --show-toplevel');
-      const root = stdout?.trim();
-      if (root) dirPath = root;
-    } catch (_) {
-      // 非Git仓库或命令失败，使用 CWD 即可
-    }
-    if (showConsole) console.log(`记录最近打开目录: ${dirPath}`)
-    await configManager.saveRecentDirectory(dirPath);
-    if (showConsole) console.log(chalk.gray(`已记录最近打开目录: ${dirPath}`));
-  } catch (e) {
-    console.warn(chalk.yellow(`记录最近目录失败: ${e?.message || e}`));
-  }
-  
-  // 添加请求日志中间件
-  app.use(createRequestLogger({ chalk }));
-
-  // 静态文件服务
-  app.use(express.static(path.join(__dirname, '../public')));
-
-  registerExecRoutes({
-    app,
-    execGitCommand,
-    addCommandToHistory,
-    getCurrentProjectPath: () => currentProjectPath,
-    nextProcessId: () => processIdCounter++,
-    runningProcesses
-  });
-
-  registerCodeRoutes({
-    app
-  });
-
-  registerTerminalRoutes({
-    app,
-    getCurrentProjectPath: () => currentProjectPath,
-    nextTerminalSessionId: () => terminalSessionIdCounter++,
-    terminalSessions
-  });
-
-  registerProcessRoutes({
-    app,
-    runningProcesses,
-  });
-
-  // API路由
-  // 移除了 /api/status 端点，因为前端只使用 porcelain 格式
-  registerStatusRoutes({
-    app,
-    getCommandHistory,
-    execGitCommand
-  });
-  
-  registerBranchStatusRoutes({
-    app,
-    execGitCommand,
-    getIsGitRepo: () => isGitRepo,
-    getBranchStatusCache: () => branchStatusCache,
-    setBranchStatusCache: (v) => { branchStatusCache = v; },
-    getRecentPushStatus: () => recentPushStatus,
-    setRecentPushStatus: (v) => { recentPushStatus = v; }
-  });
-
-  // 清除分支缓存的函数（在分支切换时调用）
-  function clearBranchCache() {
-    console.log('清除分支缓存');
-    // 清除5秒分支状态缓存
-    branchStatusCache = {
-      currentBranch: null,
-      upstreamBranch: null,
-      lastUpdate: 0,
-      cacheTimeout: 5000
-    };
-    // 清除推送状态标记
-    recentPushStatus = {
-      justPushed: false,
-      pushTime: 0,
-      validDuration: 10000
-    };
-  }
-
-  registerGitRoutes({
-    app,
-    execGitCommand,
-    clearBranchCache
-  });
-
-  registerFsRoutes({
-    app,
-    execGitCommand,
-    configManager,
-    io,
-    getCurrentProjectPath: () => currentProjectPath,
-    setCurrentProjectPath: (v) => { currentProjectPath = v; },
-    getProjectRoomId: () => projectRoomId,
-    setProjectRoomId: (v) => { projectRoomId = v; },
-    setIsGitRepo: (v) => { isGitRepo = v; }
-  });
-
-  registerConfigRoutes({
-    app,
-    configManager,
-    execGitCommand,
-    getCurrentProjectPath: () => currentProjectPath
-  });
-
-  registerNpmRoutes({
-    app,
-    getCurrentProjectPath: () => currentProjectPath
-  });
-
-  registerFileOpenRoutes({
-    app
-  });
-
-  // local-file-picker 中间件，提供 /api/fs/* 文件浏览路由
-  app.use('/api', createFilePickerMiddleware());
-
-  // ai-model-form 中间件：提供 /api/ai-model/* 路由（模型列表/测试/暂存保存）
-  app.use('/api', createAiModelMiddleware());
-
-  registerCodeAnalysisRoutes({ app, configManager });
-
-  // 实例注册表 API：列出当前所有运行中的 GUI
-  registerInstancesRoutes({
-    app,
-    registry: instanceRegistry,
-    getCurrentInstanceId: () => process.pid
-  });
-
-  registerGitOpsRoutes({
-    app,
-    execGitCommand,
-    configManager,
-    execGitAddWithLockFilter,
-    addCommandToHistory,
-    clearCommandHistory,
-    checkAndClearGitLock,
-    getIsGitRepo: () => isGitRepo,
-    setRecentPushStatus: (v) => { recentPushStatus = v; }
-  });
-  registerUiSocketHandlers({
-    io,
-    getProjectRoomId: () => projectRoomId,
-    getCurrentProjectPath: () => currentProjectPath,
-    getAndBroadcastStatus,
-    getCommandHistory,
-    clearCommandHistory,
-    addCommandToHistory,
-    runningProcesses,
-    nextProcessId: () => ++processIdCounter,
-    spawn,
-    exec,
-    path,
-    iconv
-  });
-  
-  // 获取并广播Git状态 (优化版本 - 只获取porcelain格式)
-  async function getAndBroadcastStatus() {
-    try {
-      // 如果不是Git仓库，发送特殊状态
-      if (!isGitRepo) {
-        io.to(projectRoomId).emit('git_status_update', {
-          isGitRepo: false,
-          porcelain: '',
-          timestamp: new Date().toISOString(),
-          projectPath: currentProjectPath
-        });
-        return;
-      }
-
-      // 只获取porcelain格式状态，不再获取完整的git status
-      const { stdout: porcelainOutput } = await execGitCommand('git status --porcelain --untracked-files=all');
-
-      // 广播到当前项目房间的所有客户端
-      io.to(projectRoomId).emit('git_status_update', {
-        isGitRepo: true,
-        porcelain: porcelainOutput,
-        timestamp: new Date().toISOString(),
-        projectPath: currentProjectPath
-      });
-
-      console.log(`已广播Git状态更新到房间: ${projectRoomId}`);
-    } catch (error) {
-      console.error('获取或广播Git状态失败:', error);
-    }
-  }
-  
-  // 检查当前目录是否是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('======================================'));
-  }
-  
-  // 启动服务器
-  // 端口策略：默认从 [4000, 6000) 随机挑起点，再顺序扫描 EADDRINUSE；
-  // 可通过 PORT 环境变量强制使用固定端口（向后兼容 + 便于书签/调试）
-  const portStrategy = resolveStartPort();
-  if (portStrategy.source === 'env') {
-    console.log(chalk.cyan(`[端口] 使用环境变量 PORT=${portStrategy.startPort}`));
-  } else {
-    console.log(chalk.cyan(`[端口] 随机起点 ${portStrategy.startPort}（范围 ${portStrategy.min}-${portStrategy.max}，遇到占用会顺延）`));
-  }
-
-  // 创建一个函数来保存端口号到文件和环境变量
-  // 使用闭包保存端口状态，防止多次写入相同端口
-  const savePortToFile = createSavePortToFile({ savePort, fs, path });
-  // 使用变量标记回调是否已执行，防止多次触发
-  const callbackExecutedRef = { value: false };
-
-  // 用 'listening' 事件做注册触发：startServerOnAvailablePort 的 await
-  // 在端口重试场景下不一定按时返回，但 'listening' 事件只在服务器真正绑定端口时触发
-  let registerDone = false;
-  httpServer.once('listening', () => {
-    if (registerDone) return;
-    registerDone = true;
-    registerCurrentInstance().catch((e) => {
-      console.warn(chalk.yellow(`[instanceRegistry] 启动注册流程失败: ${e?.message || e}`));
-    });
-  });
-
-  // 尝试在可用端口上启动服务器（不等待；listen 事件会驱动后续逻辑）
-  startServerOnAvailablePort({
-    httpServer,
-    startPort: portStrategy.startPort,
-    chalk,
-    open,
-    noOpen,
-    isGitRepo,
-    savePortToFile,
-    maxTries: 100,
-    callbackExecutedRef
-  }).catch((e) => {
-    console.error('启动服务器失败:', e);
-  });
-
-  // 把所有注册/心跳/watch 逻辑封装到独立函数，由 listening 事件触发
-  async function registerCurrentInstance() {
-    const addr = httpServer.address();
-    const currentPort = addr && addr.port;
-    if (!currentPort) {
-      console.warn(chalk.yellow('[instanceRegistry] 无法获取当前端口，跳过注册'));
-      return;
-    }
-
-    try {
-      const projectName = await instanceRegistry._resolveProjectName(currentProjectPath);
-      await instanceRegistry.register({
-        pid: process.pid,
-        port: currentPort,
-        projectPath: currentProjectPath,
-        projectName,
-        hostname: os.hostname()
-      });
-      console.log(chalk.green(`[instanceRegistry] 已注册 pid=${process.pid} port=${currentPort} name=${projectName}`));
-    } catch (e) {
-      console.warn(chalk.yellow(`[instanceRegistry] 注册失败: ${e?.message || e}`));
-      return;
-    }
-
-    // 5 秒心跳
-    const heartbeatTimer = setInterval(() => {
-      instanceRegistry.heartbeat(process.pid, { projectPath: currentProjectPath })
-        .catch((e) => console.warn(chalk.yellow(`[instanceRegistry] 心跳失败: ${e?.message || e}`)));
-    }, 5000);
-
-    // 监听注册表文件变化：任何进程写入都会触发，向本进程的所有客户端广播
-    // fs.watch 在 Windows 上偶有不可靠，Socket.IO 推送 + 前端轮询（15s）兜底
-    const stopWatcher = instanceRegistry.watch(async (fresh) => {
-      try {
-        io.emit('instances_changed', { instances: fresh });
-      } catch (e) {
-        console.warn(chalk.yellow(`[instanceRegistry] 广播失败: ${e?.message || e}`));
-      }
-    }, fsSync.watch);
-
-    // 优雅退出：SIGINT/SIGTERM 触发异步 unregister + 清心跳
-    const shutdown = async (signal) => {
-      try { clearInterval(heartbeatTimer); } catch (_) {}
-      try { await instanceRegistry.unregister(process.pid); } catch (_) {}
-      console.log(chalk.gray(`[instanceRegistry] 收到 ${signal}，已清理本实例`));
-    };
-    process.on('SIGINT', () => { shutdown('SIGINT'); });
-    process.on('SIGTERM', () => { shutdown('SIGTERM'); });
-    // 'exit' 是同步钩子，无法 await：仅关闭 watcher；kill -9 走心跳超时
-    process.on('exit', () => {
-      try { stopWatcher && stopWatcher(); } catch (_) {}
-    });
-  }
-
- }
-
- export default startUIServer;
+// Copyright 2026 xz333221
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+//
+import express from 'express';
+import { createServer } from 'http';
+import { fileURLToPath } from 'url';
+import path from 'path';
+import { execGitCommand, getCommandHistory, addCommandToHistory, clearCommandHistory, registerSocketIO, execGitAddWithLockFilter, checkAndClearGitLock } from '../../utils/index.js';
+import open from 'open';
+import config from '../../config.js';
+import chalk from 'chalk';
+import fs from 'fs/promises';
+import fsSync from 'fs';
+import os from 'os';
+import { Server } from 'socket.io';
+import { spawn, exec } from 'child_process';
+import iconv from 'iconv-lite';
+import { createRequestLogger } from './middleware/requestLogger.js';
+import { registerUiSocketHandlers } from './socket/registerUiSocketHandlers.js';
+import { registerExecRoutes } from './routes/exec.js';
+import { registerTerminalRoutes } from './routes/terminal.js';
+import { registerProcessRoutes } from './routes/process.js';
+import { registerStatusRoutes } from './routes/status.js';
+import { registerBranchStatusRoutes } from './routes/branchStatus.js';
+import { registerConfigRoutes } from './routes/config.js';
+import { registerGitRoutes } from './routes/git.js';
+import { registerFsRoutes } from './routes/fs.js';
+import { registerNpmRoutes } from './routes/npm.js';
+import { registerFileOpenRoutes } from './routes/fileOpen.js';
+import { registerGitOpsRoutes } from './routes/gitOps.js';
+import { registerCodeRoutes } from './routes/code.js';
+import { registerCodeAnalysisRoutes } from './routes/codeAnalysis.js';
+import { registerInstancesRoutes } from './routes/instances.js';
+import { createInstanceRegistry } from './utils/instanceRegistry.js';
+import { createSavePortToFile } from './utils/createSavePortToFile.js';
+import { startServerOnAvailablePort } from './utils/startServerOnAvailablePort.js';
+import { resolveStartPort } from './utils/randomStartPort.js';
+import { createFilePickerMiddleware } from 'local-file-picker';
+import { createAiModelMiddleware } from 'ai-model-form';
+
+const __filename = fileURLToPath(import.meta.url);
+const __dirname = path.dirname(__filename);
+const configManager = config; // 确保 configManager 可用
+// 存储正在运行的进程（用于停止功能）
+const runningProcesses = new Map(); // key: processId, value: { childProcess, command, startTime }
+let processIdCounter = 0;
+
+const terminalSessions = new Map(); // key: terminalSessionId, value: { id, command, workingDirectory, pid, createdAt, lastStartedAt }
+let terminalSessionIdCounter = 0;
+
+// 分支状态缓存
+let branchStatusCache = {
+  currentBranch: null,
+  upstreamBranch: null,
+  lastUpdate: 0,
+  cacheTimeout: 5000 // 5秒缓存
+};
+
+// 推送状态标记 - 用于优化推送后的分支状态查询
+let recentPushStatus = {
+  justPushed: false,
+  pushTime: 0,
+  validDuration: 10000 // 推送后10秒内认为分支状态是同步的
+};
+
+const showConsole = true;
+async function startUIServer(noOpen = false, savePort = false) {
+  const app = express();
+  const httpServer = createServer(app);
+  const io = new Server(httpServer);
+  if (showConsole) console.log(`创建服务成功`)
+  
+  // 获取当前项目的唯一标识（使用工作目录路径）
+  // 需要在切换目录时更新，故使用 let
+  let currentProjectPath = process.cwd();
+  let projectRoomId = `project:${currentProjectPath.replace(/[\\/:\s]/g, '_')}`;
+  
+  console.log(chalk.blue(`项目房间ID: ${projectRoomId}`));
+  console.log(chalk.blue(`项目路径: ${currentProjectPath}`));
+  
+  // 注册Socket.io实例，用于命令历史通知
+  registerSocketIO(io);
+
+  // 构建实例注册表（用于跨进程共享"当前运行中的 GUI"信息）
+  // 注册表文件位于用户主目录，所有 g ui 进程共享写入
+  const instanceRegistry = createInstanceRegistry({
+    fs,
+    path,
+    os,
+    registryPath: path.join(os.homedir(), '.zen-gitsync-instances.json')
+  });
+
+  // 添加全局中间件来解析JSON请求体
+  app.use(express.json());
+
+  // 记录最近打开的目录（优先 Git 根目录，其次当前工作目录）
+  try {
+    let dirPath = process.cwd();
+    try {
+      if(showConsole) console.log(`记录最近打开目录`)
+      const { stdout } = await execGitCommand('git rev-parse --show-toplevel');
+      const root = stdout?.trim();
+      if (root) dirPath = root;
+    } catch (_) {
+      // 非Git仓库或命令失败，使用 CWD 即可
+    }
+    if (showConsole) console.log(`记录最近打开目录: ${dirPath}`)
+    await configManager.saveRecentDirectory(dirPath);
+    if (showConsole) console.log(chalk.gray(`已记录最近打开目录: ${dirPath}`));
+  } catch (e) {
+    console.warn(chalk.yellow(`记录最近目录失败: ${e?.message || e}`));
+  }
+  
+  // 添加请求日志中间件
+  app.use(createRequestLogger({ chalk }));
+
+  // 静态文件服务
+  app.use(express.static(path.join(__dirname, '../public')));
+
+  registerExecRoutes({
+    app,
+    execGitCommand,
+    addCommandToHistory,
+    getCurrentProjectPath: () => currentProjectPath,
+    nextProcessId: () => processIdCounter++,
+    runningProcesses
+  });
+
+  registerCodeRoutes({
+    app
+  });
+
+  registerTerminalRoutes({
+    app,
+    getCurrentProjectPath: () => currentProjectPath,
+    nextTerminalSessionId: () => terminalSessionIdCounter++,
+    terminalSessions
+  });
+
+  registerProcessRoutes({
+    app,
+    runningProcesses,
+  });
+
+  // API路由
+  // 移除了 /api/status 端点，因为前端只使用 porcelain 格式
+  registerStatusRoutes({
+    app,
+    getCommandHistory,
+    execGitCommand
+  });
+  
+  registerBranchStatusRoutes({
+    app,
+    execGitCommand,
+    getIsGitRepo: () => isGitRepo,
+    getBranchStatusCache: () => branchStatusCache,
+    setBranchStatusCache: (v) => { branchStatusCache = v; },
+    getRecentPushStatus: () => recentPushStatus,
+    setRecentPushStatus: (v) => { recentPushStatus = v; }
+  });
+
+  // 清除分支缓存的函数（在分支切换时调用）
+  function clearBranchCache() {
+    console.log('清除分支缓存');
+    // 清除5秒分支状态缓存
+    branchStatusCache = {
+      currentBranch: null,
+      upstreamBranch: null,
+      lastUpdate: 0,
+      cacheTimeout: 5000
+    };
+    // 清除推送状态标记
+    recentPushStatus = {
+      justPushed: false,
+      pushTime: 0,
+      validDuration: 10000
+    };
+  }
+
+  registerGitRoutes({
+    app,
+    execGitCommand,
+    clearBranchCache
+  });
+
+  registerFsRoutes({
+    app,
+    execGitCommand,
+    configManager,
+    io,
+    getCurrentProjectPath: () => currentProjectPath,
+    setCurrentProjectPath: (v) => { currentProjectPath = v; },
+    getProjectRoomId: () => projectRoomId,
+    setProjectRoomId: (v) => { projectRoomId = v; },
+    setIsGitRepo: (v) => { isGitRepo = v; }
+  });
+
+  registerConfigRoutes({
+    app,
+    configManager,
+    execGitCommand,
+    getCurrentProjectPath: () => currentProjectPath
+  });
+
+  registerNpmRoutes({
+    app,
+    getCurrentProjectPath: () => currentProjectPath
+  });
+
+  registerFileOpenRoutes({
+    app
+  });
+
+  // local-file-picker 中间件，提供 /api/fs/* 文件浏览路由
+  app.use('/api', createFilePickerMiddleware());
+
+  // ai-model-form 中间件：提供 /api/ai-model/* 路由（模型列表/测试/暂存保存）
+  app.use('/api', createAiModelMiddleware());
+
+  registerCodeAnalysisRoutes({ app, configManager });
+
+  // 实例注册表 API：列出当前所有运行中的 GUI
+  registerInstancesRoutes({
+    app,
+    registry: instanceRegistry,
+    getCurrentInstanceId: () => process.pid
+  });
+
+  registerGitOpsRoutes({
+    app,
+    execGitCommand,
+    configManager,
+    execGitAddWithLockFilter,
+    addCommandToHistory,
+    clearCommandHistory,
+    checkAndClearGitLock,
+    getIsGitRepo: () => isGitRepo,
+    setRecentPushStatus: (v) => { recentPushStatus = v; }
+  });
+  registerUiSocketHandlers({
+    io,
+    getProjectRoomId: () => projectRoomId,
+    getCurrentProjectPath: () => currentProjectPath,
+    getAndBroadcastStatus,
+    getCommandHistory,
+    clearCommandHistory,
+    addCommandToHistory,
+    runningProcesses,
+    nextProcessId: () => ++processIdCounter,
+    spawn,
+    exec,
+    path,
+    iconv
+  });
+  
+  // 获取并广播Git状态 (优化版本 - 只获取porcelain格式)
+  async function getAndBroadcastStatus() {
+    try {
+      // 如果不是Git仓库，发送特殊状态
+      if (!isGitRepo) {
+        io.to(projectRoomId).emit('git_status_update', {
+          isGitRepo: false,
+          porcelain: '',
+          timestamp: new Date().toISOString(),
+          projectPath: currentProjectPath
+        });
+        return;
+      }
+
+      // 只获取porcelain格式状态，不再获取完整的git status
+      const { stdout: porcelainOutput } = await execGitCommand('git status --porcelain --untracked-files=all');
+
+      // 广播到当前项目房间的所有客户端
+      io.to(projectRoomId).emit('git_status_update', {
+        isGitRepo: true,
+        porcelain: porcelainOutput,
+        timestamp: new Date().toISOString(),
+        projectPath: currentProjectPath
+      });
+
+      console.log(`已广播Git状态更新到房间: ${projectRoomId}`);
+    } catch (error) {
+      console.error('获取或广播Git状态失败:', error);
+    }
+  }
+  
+  // 检查当前目录是否是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('======================================'));
+  }
+  
+  // 启动服务器
+  // 端口策略：默认从 [4000, 6000) 随机挑起点，再顺序扫描 EADDRINUSE；
+  // 可通过 PORT 环境变量强制使用固定端口（向后兼容 + 便于书签/调试）
+  const portStrategy = resolveStartPort();
+  if (portStrategy.source === 'env') {
+    console.log(chalk.cyan(`[端口] 使用环境变量 PORT=${portStrategy.startPort}`));
+  } else {
+    console.log(chalk.cyan(`[端口] 随机起点 ${portStrategy.startPort}（范围 ${portStrategy.min}-${portStrategy.max}，遇到占用会顺延）`));
+  }
+
+  // 创建一个函数来保存端口号到文件和环境变量
+  // 使用闭包保存端口状态，防止多次写入相同端口
+  const savePortToFile = createSavePortToFile({ savePort, fs, path });
+  // 使用变量标记回调是否已执行，防止多次触发
+  const callbackExecutedRef = { value: false };
+
+  // 用 'listening' 事件做注册触发：startServerOnAvailablePort 的 await
+  // 在端口重试场景下不一定按时返回，但 'listening' 事件只在服务器真正绑定端口时触发
+  let registerDone = false;
+  httpServer.once('listening', () => {
+    if (registerDone) return;
+    registerDone = true;
+    registerCurrentInstance().catch((e) => {
+      console.warn(chalk.yellow(`[instanceRegistry] 启动注册流程失败: ${e?.message || e}`));
+    });
+  });
+
+  // 尝试在可用端口上启动服务器（不等待；listen 事件会驱动后续逻辑）
+  startServerOnAvailablePort({
+    httpServer,
+    startPort: portStrategy.startPort,
+    chalk,
+    open,
+    noOpen,
+    isGitRepo,
+    savePortToFile,
+    maxTries: 100,
+    callbackExecutedRef
+  }).catch((e) => {
+    console.error('启动服务器失败:', e);
+  });
+
+  // 把所有注册/心跳/watch 逻辑封装到独立函数，由 listening 事件触发
+  async function registerCurrentInstance() {
+    const addr = httpServer.address();
+    const currentPort = addr && addr.port;
+    if (!currentPort) {
+      console.warn(chalk.yellow('[instanceRegistry] 无法获取当前端口，跳过注册'));
+      return;
+    }
+
+    try {
+      const projectName = await instanceRegistry._resolveProjectName(currentProjectPath);
+      await instanceRegistry.register({
+        pid: process.pid,
+        port: currentPort,
+        projectPath: currentProjectPath,
+        projectName,
+        hostname: os.hostname()
+      });
+      console.log(chalk.green(`[instanceRegistry] 已注册 pid=${process.pid} port=${currentPort} name=${projectName}`));
+    } catch (e) {
+      console.warn(chalk.yellow(`[instanceRegistry] 注册失败: ${e?.message || e}`));
+      return;
+    }
+
+    // 5 秒心跳
+    const heartbeatTimer = setInterval(() => {
+      instanceRegistry.heartbeat(process.pid, { projectPath: currentProjectPath })
+        .catch((e) => console.warn(chalk.yellow(`[instanceRegistry] 心跳失败: ${e?.message || e}`)));
+    }, 5000);
+
+    // 监听注册表文件变化：任何进程写入都会触发，向本进程的所有客户端广播
+    // fs.watch 在 Windows 上偶有不可靠，Socket.IO 推送 + 前端轮询（15s）兜底
+    const stopWatcher = instanceRegistry.watch(async (fresh) => {
+      try {
+        io.emit('instances_changed', { instances: fresh });
+      } catch (e) {
+        console.warn(chalk.yellow(`[instanceRegistry] 广播失败: ${e?.message || e}`));
+      }
+    }, fsSync.watch);
+
+    // 优雅退出：SIGINT/SIGTERM 触发异步 unregister + 清心跳
+    const shutdown = async (signal) => {
+      try { clearInterval(heartbeatTimer); } catch (_) {}
+      try { await instanceRegistry.unregister(process.pid); } catch (_) {}
+      console.log(chalk.gray(`[instanceRegistry] 收到 ${signal}，已清理本实例`));
+    };
+    process.on('SIGINT', () => { shutdown('SIGINT'); });
+    process.on('SIGTERM', () => { shutdown('SIGTERM'); });
+    // 'exit' 是同步钩子，无法 await：仅关闭 watcher；kill -9 走心跳超时
+    process.on('exit', () => {
+      try { stopWatcher && stopWatcher(); } catch (_) {}
+    });
+  }
+
+ }
+
+ export default startUIServer;