zen-gitsync 2.12.2 → 2.12.4

package/src/ui/server/routes/process.js

@@ -1,68 +1,82 @@
-export function registerProcessRoutes({
-  app,
-  runningProcesses,
-  exec
-}) {
-  // 停止正在运行的进程
-  app.post('/api/kill-process', async (req, res) => {
-    try {
-      const { processId } = req.body || {};
-      if (!processId || typeof processId !== 'number') {
-        return res.status(400).json({ success: false, error: 'processId 必须是数字' });
-      }
-
-      const processInfo = runningProcesses.get(processId);
-      if (!processInfo) {
-        return res.status(404).json({
-          success: false,
-          error: `进程 #${processId} 不存在或已结束`
-        });
-      }
-
-      console.log(`[进程管理] 尝试停止进程 #${processId}: ${processInfo.command}`);
-
-      try {
-        // 在 Windows 上需要使用 taskkill 来杀死整个进程树
-        if (process.platform === 'win32') {
-          // 使用已导入的 exec
-          // /F 强制终止, /T 终止进程树
-          exec(`taskkill /pid ${processInfo.childProcess.pid} /T /F`, (error) => {
-            if (error) {
-              console.error(`[进程管理] taskkill 失败:`, error);
-            }
-          });
-        } else {
-          // Unix/Linux/Mac 使用 SIGTERM
-          processInfo.childProcess.kill('SIGTERM');
-
-          // 如果 2 秒后还没结束，使用 SIGKILL 强制终止
-          setTimeout(() => {
-            if (runningProcesses.has(processId)) {
-              console.log(`[进程管理] 进程 #${processId} 未响应 SIGTERM，使用 SIGKILL 强制终止`);
-              processInfo.childProcess.kill('SIGKILL');
-            }
-          }, 2000);
-        }
-
-        res.json({
-          success: true,
-          message: `已发送停止信号到进程 #${processId}`,
-          processId,
-          command: processInfo.command
-        });
-      } catch (killError) {
-        console.error(`[进程管理] 停止进程失败:`, killError);
-        res.status(500).json({
-          success: false,
-          error: `停止进程失败: ${killError.message}`
-        });
-      }
-    } catch (error) {
-      console.error('停止进程接口失败:', error);
-      res.status(500).json({
-        success: false,
-        error: `停止进程失败: ${error.message}`
-      });
-    }
-  });
-}
+// 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.
+//
+export function registerProcessRoutes({
+  app,
+  runningProcesses,
+  exec
+}) {
+  // 停止正在运行的进程
+  app.post('/api/kill-process', async (req, res) => {
+    try {
+      const { processId } = req.body || {};
+      if (!processId || typeof processId !== 'number') {
+        return res.status(400).json({ success: false, error: 'processId 必须是数字' });
+      }
+
+      const processInfo = runningProcesses.get(processId);
+      if (!processInfo) {
+        return res.status(404).json({
+          success: false,
+          error: `进程 #${processId} 不存在或已结束`
+        });
+      }
+
+      console.log(`[进程管理] 尝试停止进程 #${processId}: ${processInfo.command}`);
+
+      try {
+        // 在 Windows 上需要使用 taskkill 来杀死整个进程树
+        if (process.platform === 'win32') {
+          // 使用已导入的 exec
+          // /F 强制终止, /T 终止进程树
+          exec(`taskkill /pid ${processInfo.childProcess.pid} /T /F`, (error) => {
+            if (error) {
+              console.error(`[进程管理] taskkill 失败:`, error);
+            }
+          });
+        } else {
+          // Unix/Linux/Mac 使用 SIGTERM
+          processInfo.childProcess.kill('SIGTERM');
+
+          // 如果 2 秒后还没结束，使用 SIGKILL 强制终止
+          setTimeout(() => {
+            if (runningProcesses.has(processId)) {
+              console.log(`[进程管理] 进程 #${processId} 未响应 SIGTERM，使用 SIGKILL 强制终止`);
+              processInfo.childProcess.kill('SIGKILL');
+            }
+          }, 2000);
+        }
+
+        res.json({
+          success: true,
+          message: `已发送停止信号到进程 #${processId}`,
+          processId,
+          command: processInfo.command
+        });
+      } catch (killError) {
+        console.error(`[进程管理] 停止进程失败:`, killError);
+        res.status(500).json({
+          success: false,
+          error: `停止进程失败: ${killError.message}`
+        });
+      }
+    } catch (error) {
+      console.error('停止进程接口失败:', error);
+      res.status(500).json({
+        success: false,
+        error: `停止进程失败: ${error.message}`
+      });
+    }
+  });
+}

package/src/ui/server/routes/status.js

@@ -1,53 +1,67 @@
-import { promises as fs } from 'fs';
-import path from 'path';
-
-export function registerStatusRoutes({
-  app,
-  getCommandHistory,
-  execGitCommand
-}) {
-  // Add new endpoint for command history
-  app.get('/api/command-history', async (req, res) => {
-    try {
-      const history = getCommandHistory();
-      res.json({ success: true, history });
-    } catch (error) {
-      res.status(500).json({ success: false, error: error.message });
-    }
-  });
-
-  app.get('/api/status_porcelain', async (req, res) => {
-    try {
-      const { stdout } = await execGitCommand('git status --porcelain --untracked-files=all');
-      // 检测是否处于 MERGING 状态（MERGE_HEAD 文件存在）
-      let isMergeInProgress = false;
-      let mergeMessage = '';
-      try {
-        const { stdout: mergeHead } = await execGitCommand('git rev-parse -q --verify MERGE_HEAD');
-        isMergeInProgress = mergeHead.trim().length > 0;
-        if (isMergeInProgress) {
-          // 读取 Git 自动生成的合并提交信息
-          try {
-            const { stdout: gitDir } = await execGitCommand('git rev-parse --git-dir');
-            const mergeMsgPath = path.resolve(gitDir.trim(), 'MERGE_MSG');
-            const raw = await fs.readFile(mergeMsgPath, 'utf-8');
-            // 过滤掉以 # 开头的注释行，取第一个非空行
-            mergeMessage = raw
-              .split('\n')
-              .filter(line => line.trim() && !line.startsWith('#'))
-              .join('\n')
-              .trim();
-          } catch (_) {
-            // MERGE_MSG 不存在时忽略
-          }
-        }
-      } catch (_) {
-        // MERGE_HEAD 不存在时命令会报错，属正常情况
-        isMergeInProgress = false;
-      }
-      res.json({ status: stdout, isMergeInProgress, mergeMessage });
-    } catch (error) {
-      res.status(500).json({ error: error.message });
-    }
-  });
-}
+// 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 { promises as fs } from 'fs';
+import path from 'path';
+
+export function registerStatusRoutes({
+  app,
+  getCommandHistory,
+  execGitCommand
+}) {
+  // Add new endpoint for command history
+  app.get('/api/command-history', async (req, res) => {
+    try {
+      const history = getCommandHistory();
+      res.json({ success: true, history });
+    } catch (error) {
+      res.status(500).json({ success: false, error: error.message });
+    }
+  });
+
+  app.get('/api/status_porcelain', async (req, res) => {
+    try {
+      const { stdout } = await execGitCommand('git status --porcelain --untracked-files=all');
+      // 检测是否处于 MERGING 状态（MERGE_HEAD 文件存在）
+      let isMergeInProgress = false;
+      let mergeMessage = '';
+      try {
+        const { stdout: mergeHead } = await execGitCommand('git rev-parse -q --verify MERGE_HEAD');
+        isMergeInProgress = mergeHead.trim().length > 0;
+        if (isMergeInProgress) {
+          // 读取 Git 自动生成的合并提交信息
+          try {
+            const { stdout: gitDir } = await execGitCommand('git rev-parse --git-dir');
+            const mergeMsgPath = path.resolve(gitDir.trim(), 'MERGE_MSG');
+            const raw = await fs.readFile(mergeMsgPath, 'utf-8');
+            // 过滤掉以 # 开头的注释行，取第一个非空行
+            mergeMessage = raw
+              .split('\n')
+              .filter(line => line.trim() && !line.startsWith('#'))
+              .join('\n')
+              .trim();
+          } catch (_) {
+            // MERGE_MSG 不存在时忽略
+          }
+        }
+      } catch (_) {
+        // MERGE_HEAD 不存在时命令会报错，属正常情况
+        isMergeInProgress = false;
+      }
+      res.json({ status: stdout, isMergeInProgress, mergeMessage });
+    } catch (error) {
+      res.status(500).json({ error: error.message });
+    }
+  });
+}