vg-coder-cli 2.0.15 → 2.0.16

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vg-coder-cli",
-  "version": "2.0.15",
+  "version": "2.0.16",
   "description": "🚀 CLI tool to analyze projects, concatenate source files, count tokens, and export HTML with syntax highlighting and copy functionality",
   "main": "src/index.js",
   "bin": {
@@ -31,26 +31,27 @@
     "url": "https://github.com/tinhthanh/vg-coder-cli.git"
   },
   "dependencies": {
+    "body-parser": "^1.20.2",
+    "chalk": "^4.1.2",
     "commander": "^11.1.0",
+    "cors": "^2.8.5",
     "directory-tree": "^3.5.1",
-    "tiktoken": "^1.0.10",
+    "express": "^4.18.2",
+    "fs-extra": "^11.2.0",
     "highlight.js": "^11.9.0",
     "ignore": "^5.3.0",
-    "fs-extra": "^11.2.0",
-    "path": "^0.12.7",
-    "chalk": "^4.1.2",
-    "ora": "^5.4.1",
-    "express": "^4.18.2",
-    "cors": "^2.8.5",
-    "body-parser": "^1.20.2",
     "node-pty": "^1.0.0",
-    "socket.io": "^4.7.2"
+    "ora": "^5.4.1",
+    "path": "^0.12.7",
+    "socket.io": "^4.7.2",
+    "tiktoken": "^1.0.10",
+    "vg-coder-cli": "^2.0.15"
   },
   "devDependencies": {
-    "jest": "^29.7.0",
-    "nodemon": "^3.0.2",
     "@types/jest": "^29.5.8",
-    "adm-zip": "^0.5.10"
+    "adm-zip": "^0.5.10",
+    "jest": "^29.7.0",
+    "nodemon": "^3.0.2"
   },
   "engines": {
     "node": ">=16.0.0"

package/src/server/api-server.js

@@ -52,10 +52,8 @@ class ApiServer {
   setupSocketIO() {
     this.io.on('connection', (socket) => {
         // Nhận event init với termId
-        // FIX: Thêm default value = {} để tránh crash khi data undefined
         socket.on('terminal:init', (data) => {
             if (!data || !data.termId) {
-                // console.warn('[Socket] Ignored invalid terminal:init', data);
                 return;
             }
             const { termId, cols, rows } = data;
@@ -101,11 +99,54 @@ class ApiServer {
 
     this.app.get('/api/git/diff', async (req, res) => {
       try {
-        const { stdout, stderr } = await execAsync('git diff HEAD', { 
+        // 1. Lấy diff của các file đã track (modified, deleted, staged)
+        const { stdout: diffStdout } = await execAsync('git diff HEAD', { 
             cwd: this.workingDir,
             maxBuffer: 20 * 1024 * 1024 
         });
-        res.json({ diff: stdout });
+
+        // 2. Lấy danh sách untracked files (files mới tạo chưa add)
+        const { stdout: untrackedStdout } = await execAsync('git ls-files --others --exclude-standard', {
+            cwd: this.workingDir,
+            maxBuffer: 20 * 1024 * 1024
+        });
+
+        let combinedDiff = diffStdout || '';
+        const untrackedFiles = untrackedStdout.split('\n').filter(f => f.trim());
+
+        // 3. Tạo diff giả lập cho untracked files để hiển thị trên UI
+        if (untrackedFiles.length > 0) {
+            if (combinedDiff && !combinedDiff.endsWith('\n')) combinedDiff += '\n';
+
+            for (const file of untrackedFiles) {
+                try {
+                    const filePath = path.join(this.workingDir, file);
+                    const stat = await fs.stat(filePath);
+                    if (stat.isDirectory()) continue;
+
+                    const content = await fs.readFile(filePath, 'utf8');
+                    
+                    // Tạo header giống git diff
+                    combinedDiff += `diff --git a/${file} b/${file}\n`;
+                    combinedDiff += `new file mode 100644\n`;
+                    combinedDiff += `--- /dev/null\n`;
+                    combinedDiff += `+++ b/${file}\n`;
+                    
+                    if (content.length > 0) {
+                        const lines = content.split('\n');
+                        combinedDiff += `@@ -0,0 +1,${lines.length} @@\n`;
+                        lines.forEach(line => {
+                            combinedDiff += `+${line}\n`;
+                        });
+                    }
+                    combinedDiff += `\n`;
+                } catch (err) {
+                    // Bỏ qua nếu lỗi đọc file (vd: binary)
+                }
+            }
+        }
+
+        res.json({ diff: combinedDiff });
       } catch (error) {
         console.error(chalk.red('❌ [GIT] Error:'), error.message);
         res.json({ diff: '', error: error.message });