@harryisfish/gitt 1.0.3 → 1.0.4

package/dist/display.js

@@ -4,35 +4,59 @@ exports.display = void 0;
 const readline_1 = require("readline");
 // ANSI 转义序列
 const CLEAR_SCREEN = '\x1b[2J';
+const CLEAR_SCREEN_AND_SCROLLBACK = '\x1b[2J\x1b[3J';
 const MOVE_TO_TOP = '\x1b[H';
 const SAVE_CURSOR = '\x1b[s';
 const RESTORE_CURSOR = '\x1b[u';
 const HIDE_CURSOR = '\x1b[?25l';
 const SHOW_CURSOR = '\x1b[?25h';
+const ALTERNATE_SCREEN_BUFFER = '\x1b[?1049h';
+const NORMAL_SCREEN_BUFFER = '\x1b[?1049l';
 class DisplayManager {
     constructor() {
         this.statusSection = [];
         this.menuSection = [];
         this.dividerLine = '';
         this.isLoading = true;
+        this.isDetailedView = false;
         // 获取终端大小
-        const { rows, columns } = process.stdout;
+        this.terminalSize = { rows: process.stdout.rows, columns: process.stdout.columns };
         // 创建分隔线
-        this.dividerLine = '─'.repeat(columns);
-        // 计算上下区域的大小
-        this.statusHeight = Math.floor(rows / 2) - 1;
-        this.menuHeight = rows - this.statusHeight - 1;
+        this.updateDividerLine();
+        // 计算上下区域的大小 - 状态区域只占一行
+        this.statusHeight = 1;
+        this.menuHeight = this.terminalSize.rows - this.statusHeight - 1;
+        // 监听终端大小变化
+        process.stdout.on('resize', () => {
+            this.terminalSize = { rows: process.stdout.rows, columns: process.stdout.columns };
+            this.updateDividerLine();
+            this.menuHeight = this.terminalSize.rows - this.statusHeight - 1;
+            if (!this.isDetailedView) {
+                this.redrawScreen();
+            }
+        });
+    }
+    updateDividerLine() {
+        this.dividerLine = '─'.repeat(this.terminalSize.columns);
     }
     // 清屏并初始化显示区域
     initDisplay() {
-        process.stdout.write(CLEAR_SCREEN + MOVE_TO_TOP);
+        // 切换到备用屏幕缓冲区，实现全屏模式
+        process.stdout.write(ALTERNATE_SCREEN_BUFFER);
+        process.stdout.write(CLEAR_SCREEN_AND_SCROLLBACK + MOVE_TO_TOP);
+        process.stdout.write(HIDE_CURSOR);
         this.drawDivider();
         this.showLoadingStatus();
+        // 确保程序退出时恢复终端状态
+        process.on('exit', () => {
+            process.stdout.write(SHOW_CURSOR);
+            process.stdout.write(NORMAL_SCREEN_BUFFER);
+        });
     }
     // 绘制分隔线
     drawDivider() {
         process.stdout.write(SAVE_CURSOR);
-        process.stdout.write(`\x1b[${this.statusHeight}H${this.dividerLine}`);
+        process.stdout.write(`\x1b[${this.statusHeight + 1}H${this.dividerLine}`);
         process.stdout.write(RESTORE_CURSOR);
     }
     // 显示加载状态
@@ -48,6 +72,29 @@ class DisplayManager {
         this.statusSection = lines;
         this.refreshStatus();
     }
+    // 更新简洁状态栏
+    updateCompactStatus(branchName, uncommittedChanges, ahead, behind) {
+        this.isLoading = false;
+        const statusLine = `🌿 ${branchName} | 📝 ${uncommittedChanges} | ⬆️ ${ahead} | ⬇️ ${behind}`;
+        this.statusSection = [statusLine];
+        this.refreshStatus();
+    }
+    // 显示详细状态信息
+    showDetailedStatus(lines) {
+        this.isDetailedView = true;
+        process.stdout.write(CLEAR_SCREEN + MOVE_TO_TOP);
+        lines.forEach(line => {
+            process.stdout.write(line + '\n');
+        });
+        process.stdout.write('\n按任意键返回主菜单...');
+        // 监听一次按键事件
+        process.stdin.setRawMode(true);
+        process.stdin.once('data', () => {
+            process.stdin.setRawMode(false);
+            this.isDetailedView = false;
+            this.redrawScreen();
+        });
+    }
     // 刷新状态区域显示
     refreshStatus() {
         process.stdout.write(SAVE_CURSOR);
@@ -64,9 +111,24 @@ class DisplayManager {
         });
         process.stdout.write(RESTORE_CURSOR);
     }
+    // 重绘整个屏幕
+    redrawScreen() {
+        process.stdout.write(CLEAR_SCREEN + MOVE_TO_TOP);
+        this.drawDivider();
+        this.refreshStatus();
+        this.prepareForMenu();
+    }
     // 准备菜单区域
     prepareForMenu() {
-        process.stdout.write(`\x1b[${this.statusHeight + 1}H\n`);
+        // 将光标移动到分隔线下方
+        process.stdout.write(`\x1b[${this.statusHeight + 2}H`);
+        // 清除菜单区域
+        for (let i = this.statusHeight + 2; i < this.terminalSize.rows; i++) {
+            process.stdout.write(`\x1b[${i}H`);
+            (0, readline_1.clearLine)(process.stdout, 0);
+        }
+        // 重新定位到菜单开始位置
+        process.stdout.write(`\x1b[${this.statusHeight + 2}H`);
     }
     // 显示错误信息
     showError(message) {

package/dist/index.js

@@ -53,6 +53,25 @@ async function checkGitRepo() {
 }
 // 异步获取并展示仓库状态信息
 async function showRepoStatus() {
+    try {
+        // 获取当前分支信息
+        const currentBranch = await git.branch();
+        const currentBranchName = currentBranch.current;
+        // 获取最新的远程分支信息
+        await git.fetch(['--all']);
+        // 获取本地与远程的差异统计
+        const status = await git.status();
+        const uncommittedChanges = status.modified.length + status.not_added.length + status.deleted.length;
+        // 更新简洁状态栏
+        display_1.display.updateCompactStatus(currentBranchName, uncommittedChanges, status.ahead, status.behind);
+    }
+    catch (error) {
+        const errorMessage = error instanceof Error ? error.message : '未知错误';
+        display_1.display.showError(`获取仓库状态信息时发生错误: ${errorMessage}`);
+    }
+}
+// 显示详细的仓库状态信息
+async function showDetailedRepoStatus() {
     try {
         const statusLines = [];
         // 获取当前分支信息
@@ -86,8 +105,8 @@ async function showRepoStatus() {
         statusLines.push('🌳 分支信息:');
         statusLines.push(`- 本地分支数: ${localBranches}`);
         statusLines.push(`- 远程分支数: ${remoteBranches}`);
-        // 更新显示
-        display_1.display.updateStatus(statusLines);
+        // 显示详细状态
+        display_1.display.showDetailedStatus(statusLines);
     }
     catch (error) {
         const errorMessage = error instanceof Error ? error.message : '未知错误';
@@ -133,6 +152,11 @@ async function showMenu() {
         const action = await (0, prompts_1.select)({
             message: '请选择要执行的操作：',
             choices: [
+                {
+                    name: '查看详细状态',
+                    value: 'status',
+                    description: '查看仓库的详细状态信息，包括提交记录和分支统计'
+                },
                 {
                     name: '清理远程已删除的分支',
                     value: 'clean',
@@ -169,7 +193,10 @@ async function main() {
                 console.log('再见！');
                 process.exit(0);
             }
-            if (action === 'clean') {
+            if (action === 'status') {
+                await showDetailedRepoStatus();
+            }
+            else if (action === 'clean') {
                 await cleanDeletedBranches();
             }
             console.log('\n');

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@harryisfish/gitt",
-  "version": "1.0.3",
+  "version": "1.0.4",
   "description": "这是一个命令行工具，用于帮助你管理 Git 仓库与远端仓库，如保持同步、推送、拉取等。",
   "main": "dist/index.js",
   "bin": {