zen-gitsync 2.16.24 → 2.16.27

package/src/ui/server/routes/git/tags.js

@@ -1,176 +1,176 @@
-// 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 { asyncRoute, HttpError } from '../../utils/asyncRoute.js'
-
-import logger from '../../utils/logger.js'
-
-export function registerGitTagRoutes({ app, execGitCommand, clearCommandHistory }) {
-  // ============ Git Tag 相关接口 ============
-
-  // 创建标签
-  app.post('/api/create-tag', asyncRoute(async (req, res) => {
-      try {
-        const { tagName, message, type, commit } = req.body;
-      
-        if (!tagName) {
-          throw new HttpError(400, '缺少标签名称');
-        }
-      
-        const tagArgs = ['tag'];
-      
-        if (type === 'annotated') {
-          // 附注标签
-          if (!message) {
-            throw new HttpError(400, '附注标签需要提供说明信息');
-          }
-          tagArgs.push('-a', tagName, '-m', message);
-        } else {
-          // 轻量标签
-          tagArgs.push(tagName);
-        }
-      
-        // 如果指定了commit，添加到命令中
-        if (commit && commit.trim()) {
-          tagArgs.push(commit.trim());
-        }
-      
-        const { stdout } = await execGitCommand(tagArgs);
-      
-        res.json({
-          success: true,
-          message: '标签创建成功',
-          output: stdout
-        });
-      } catch (error) {
-        logger.error('创建标签失败:', error);
-        res.status(500).json({ success: false, error: error.message });
-      }
-    }));
-
-  // 获取标签列表
-  app.get('/api/list-tags', asyncRoute(async (req, res) => {
-      try {
-        // 使用 git tag -n --format 获取详细信息
-        const { stdout } = await execGitCommand(
-          ['tag', '-n', '--format=%(refname:short)|%(objectname:short)|%(creatordate:iso8601)|%(subject)']
-        );
-      
-        if (!stdout.trim()) {
-          return res.json({ success: true, tags: [] });
-        }
-      
-        const tags = stdout.trim().split('\n').map(line => {
-          const [name, commit, date, message] = line.split('|');
-          return {
-            name: name || '',
-            commit: commit || '',
-            date: date || '',
-            message: message || '',
-            type: 'lightweight' // 默认为轻量标签
-          };
-        });
-      
-        // 检测哪些是附注标签
-        for (const tag of tags) {
-          try {
-            const { stdout: typeCheck } = await execGitCommand(
-              ['cat-file', '-t', tag.name],
-              { log: false }
-            );
-            if (typeCheck.trim() === 'tag') {
-              tag.type = 'annotated';
-            }
-          } catch (error) {
-            // 忽略错误，保持默认值
-          }
-        }
-      
-        res.json({ success: true, tags });
-      } catch (error) {
-        logger.error('获取标签列表失败:', error);
-        res.status(500).json({ success: false, error: error.message });
-      }
-    }));
-
-  // 推送标签到远程
-  app.post('/api/push-tag', asyncRoute(async (req, res) => {
-      try {
-        const { tagName } = req.body;
-      
-        if (!tagName) {
-          throw new HttpError(400, '缺少标签名称');
-        }
-      
-        const { stdout } = await execGitCommand(['push', 'origin', tagName]);
-      
-        res.json({
-          success: true,
-          message: '标签推送成功',
-          output: stdout
-        });
-      } catch (error) {
-        logger.error('推送标签失败:', error);
-        res.status(500).json({ success: false, error: error.message });
-      }
-    }));
-
-  // 推送所有标签到远程
-  app.post('/api/push-all-tags', asyncRoute(async (req, res) => {
-      try {
-        const { stdout } = await execGitCommand(['push', 'origin', '--tags']);
-      
-        res.json({
-          success: true,
-          message: '所有标签推送成功',
-          output: stdout
-        });
-      } catch (error) {
-        logger.error('推送所有标签失败:', error);
-        res.status(500).json({ success: false, error: error.message });
-      }
-    }));
-
-  // 删除标签
-  app.post('/api/delete-tag', asyncRoute(async (req, res) => {
-      try {
-        const { tagName } = req.body;
-      
-        if (!tagName) {
-          throw new HttpError(400, '缺少标签名称');
-        }
-      
-        const { stdout } = await execGitCommand(['tag', '-d', tagName]);
-      
-        res.json({
-          success: true,
-          message: '标签删除成功',
-          output: stdout
-        });
-      } catch (error) {
-        logger.error('删除标签失败:', error);
-        res.status(500).json({ success: false, error: error.message });
-      }
-    }));
-
-  // 添加命令历史的清空API
-  app.post('/api/clear-command-history', asyncRoute(async (req, res) => {
-      try {
-        const result = clearCommandHistory();
-        res.json({ success: result });
-      } catch (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.
+//
+import { asyncRoute, HttpError } from '../../utils/asyncRoute.js'
+
+import logger from '../../utils/logger.js'
+
+export function registerGitTagRoutes({ app, execGitCommand, clearCommandHistory }) {
+  // ============ Git Tag 相关接口 ============
+
+  // 创建标签
+  app.post('/api/create-tag', asyncRoute(async (req, res) => {
+      try {
+        const { tagName, message, type, commit } = req.body;
+      
+        if (!tagName) {
+          throw new HttpError(400, '缺少标签名称');
+        }
+      
+        const tagArgs = ['tag'];
+      
+        if (type === 'annotated') {
+          // 附注标签
+          if (!message) {
+            throw new HttpError(400, '附注标签需要提供说明信息');
+          }
+          tagArgs.push('-a', tagName, '-m', message);
+        } else {
+          // 轻量标签
+          tagArgs.push(tagName);
+        }
+      
+        // 如果指定了commit，添加到命令中
+        if (commit && commit.trim()) {
+          tagArgs.push(commit.trim());
+        }
+      
+        const { stdout } = await execGitCommand(tagArgs);
+      
+        res.json({
+          success: true,
+          message: '标签创建成功',
+          output: stdout
+        });
+      } catch (error) {
+        logger.error('创建标签失败:', error);
+        res.status(500).json({ success: false, error: error.message });
+      }
+    }));
+
+  // 获取标签列表
+  app.get('/api/list-tags', asyncRoute(async (req, res) => {
+      try {
+        // 使用 git tag -n --format 获取详细信息
+        const { stdout } = await execGitCommand(
+          ['tag', '-n', '--format=%(refname:short)|%(objectname:short)|%(creatordate:iso8601)|%(subject)']
+        );
+      
+        if (!stdout.trim()) {
+          return res.json({ success: true, tags: [] });
+        }
+      
+        const tags = stdout.trim().split('\n').map(line => {
+          const [name, commit, date, message] = line.split('|');
+          return {
+            name: name || '',
+            commit: commit || '',
+            date: date || '',
+            message: message || '',
+            type: 'lightweight' // 默认为轻量标签
+          };
+        });
+      
+        // 检测哪些是附注标签
+        for (const tag of tags) {
+          try {
+            const { stdout: typeCheck } = await execGitCommand(
+              ['cat-file', '-t', tag.name],
+              { log: false }
+            );
+            if (typeCheck.trim() === 'tag') {
+              tag.type = 'annotated';
+            }
+          } catch (error) {
+            // 忽略错误，保持默认值
+          }
+        }
+      
+        res.json({ success: true, tags });
+      } catch (error) {
+        logger.error('获取标签列表失败:', error);
+        res.status(500).json({ success: false, error: error.message });
+      }
+    }));
+
+  // 推送标签到远程
+  app.post('/api/push-tag', asyncRoute(async (req, res) => {
+      try {
+        const { tagName } = req.body;
+      
+        if (!tagName) {
+          throw new HttpError(400, '缺少标签名称');
+        }
+      
+        const { stdout } = await execGitCommand(['push', 'origin', tagName]);
+      
+        res.json({
+          success: true,
+          message: '标签推送成功',
+          output: stdout
+        });
+      } catch (error) {
+        logger.error('推送标签失败:', error);
+        res.status(500).json({ success: false, error: error.message });
+      }
+    }));
+
+  // 推送所有标签到远程
+  app.post('/api/push-all-tags', asyncRoute(async (req, res) => {
+      try {
+        const { stdout } = await execGitCommand(['push', 'origin', '--tags']);
+      
+        res.json({
+          success: true,
+          message: '所有标签推送成功',
+          output: stdout
+        });
+      } catch (error) {
+        logger.error('推送所有标签失败:', error);
+        res.status(500).json({ success: false, error: error.message });
+      }
+    }));
+
+  // 删除标签
+  app.post('/api/delete-tag', asyncRoute(async (req, res) => {
+      try {
+        const { tagName } = req.body;
+      
+        if (!tagName) {
+          throw new HttpError(400, '缺少标签名称');
+        }
+      
+        const { stdout } = await execGitCommand(['tag', '-d', tagName]);
+      
+        res.json({
+          success: true,
+          message: '标签删除成功',
+          output: stdout
+        });
+      } catch (error) {
+        logger.error('删除标签失败:', error);
+        res.status(500).json({ success: false, error: error.message });
+      }
+    }));
+
+  // 添加命令历史的清空API
+  app.post('/api/clear-command-history', asyncRoute(async (req, res) => {
+      try {
+        const result = clearCommandHistory();
+        res.json({ success: result });
+      } catch (error) {
+        res.status(500).json({ success: false, error: error.message });
+      }
+    }));
+}

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

@@ -669,6 +669,11 @@ export function registerGitOpsRoutes({
       // 构建 git log 的 argv 数组
       const logArgs = ['log', '--all'];
 
+      // 分支图需要拓扑序, 保证子提交一定先于父提交出现(避免时钟偏移导致图错乱)
+      if (withParents) {
+        logArgs.push('--topo-order');
+      }
+
       // 作者筛选(支持多作者用正则 OR)
       if (author.length > 0) {
         const validAuthors = author.filter(a => a.trim() !== '');
@@ -721,6 +726,11 @@ export function registerGitOpsRoutes({
       // 构建 git log argv 数组
       const logArgs = ['log'];
 
+      // 分支图需要拓扑序, 保证子提交一定先于父提交出现
+      if (withParents) {
+        logArgs.push('--topo-order');
+      }
+
       // 准备分支引用,确保它们被正确识别为分支而不是文件名
       // 使用 refs/heads/ 前缀明确指示这是分支
       const formattedBranchRefs = branchRefs.split(' ')

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

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