@hapico/cli 0.0.29 → 0.0.31

package/bin/tools/nativewind/index.js

@@ -0,0 +1,80 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.generateNativeWindStyleMap = generateNativeWindStyleMap;
+exports.compileAndSaveToFolder = compileAndSaveToFolder;
+const postcss_1 = __importDefault(require("postcss"));
+const tailwindcss_1 = __importDefault(require("tailwindcss"));
+const fs_1 = __importDefault(require("fs"));
+const path_1 = __importDefault(require("path"));
+// @ts-ignore
+const preset_1 = __importDefault(require("nativewind/preset"));
+// ==========================================
+// FIX LỖI IMPORT REACT-NATIVE-CSS-INTEROP
+// ==========================================
+let compileToNative;
+try {
+    const compiler = require("react-native-css-interop/dist/compiler");
+    compileToNative = compiler.compile || compiler.default;
+}
+catch (e) {
+    try {
+        const cssToRn = require("react-native-css-interop/dist/css-to-rn");
+        compileToNative = cssToRn.cssToReactNativeRuntime || cssToRn.default;
+    }
+    catch (err) {
+        throw new Error("Không thể tìm thấy hàm compile. Kiểm tra lại node_modules.");
+    }
+}
+/**
+ * Hàm biên dịch Tailwind Class sang Compiled Object
+ */
+async function generateNativeWindStyleMap(contentPaths, rawCss = "@tailwind base;\n@tailwind components;\n@tailwind utilities;") {
+    try {
+        const tailwindConfig = {
+            content: contentPaths,
+            presets: [preset_1.default],
+            theme: { extend: {} },
+        };
+        const processor = (0, postcss_1.default)([(0, tailwindcss_1.default)(tailwindConfig)]);
+        const result = await processor.process(rawCss, {
+            from: "tailwind.css",
+            to: "output.css",
+        });
+        return compileToNative(result.css, { native: true });
+    }
+    catch (error) {
+        console.error("❌ Compile Style Map Error:", error);
+        throw error;
+    }
+}
+/**
+ * Hàm hỗ trợ: Quét 1 thư mục và Lưu kết quả vào 1 thư mục khác
+ */
+async function compileAndSaveToFolder(folderToScan, // Thư mục chứa code cần quét (VD: "./src/components")
+outputFilePath // Nơi lưu kết quả (VD: "./dist/styles.json")
+) {
+    try {
+        // 1. Tạo đường dẫn quét toàn bộ file js, jsx, ts, tsx trong thư mục
+        // path.resolve(process.cwd(), ...) giúp lấy đúng đường dẫn gốc của project
+        const scanPattern = path_1.default.resolve(process.cwd(), folderToScan, "**/*.{js,jsx,ts,tsx}");
+        // console.log(`🔍 Scanning files in ${scanPattern}`);
+        // 2. Chạy hàm biên dịch
+        const compiledObject = await generateNativeWindStyleMap([scanPattern]);
+        // 3. Xử lý thư mục lưu file
+        const absoluteOutputPath = path_1.default.resolve(process.cwd(), outputFilePath);
+        const outputDir = path_1.default.dirname(absoluteOutputPath); // Lấy tên thư mục chứa file đầu ra
+        // Nếu thư mục đầu ra chưa tồn tại, Node.js sẽ tự động tạo thư mục đó (recursive: true)
+        if (!fs_1.default.existsSync(outputDir)) {
+            fs_1.default.mkdirSync(outputDir, { recursive: true });
+        }
+        // 4. Ghi Object ra file JSON
+        fs_1.default.writeFileSync(absoluteOutputPath, JSON.stringify(compiledObject, null, 2), "utf-8");
+        // console.log(`✅ Sync CSS ${absoluteOutputPath}`);
+    }
+    catch (error) {
+        console.error("❌ Lỗi khi xuất file:", error);
+    }
+}

package/bin/tools/vibe/index.js

@@ -17,7 +17,8 @@ const scanRecursively = async (dir, baseDir) => {
         const list = await promises_1.default.readdir(dir, { withFileTypes: true });
         for (const entry of list) {
             const fullPath = node_path_1.default.join(dir, entry.name);
-            const relativePath = node_path_1.default.relative(baseDir, fullPath);
+            // Chuẩn hóa đường dẫn về forward slash để nhất quán giữa các hệ điều hành
+            const relativePath = node_path_1.default.relative(baseDir, fullPath).split(node_path_1.default.sep).join('/');
             if (shouldIgnorePath(relativePath))
                 continue;
             if (entry.isDirectory()) {
@@ -212,6 +213,10 @@ const parseLLMPatch = (patchContent) => {
     let inReplace = false;
     let searchLines = [];
     let replaceLines = [];
+    // State for full file replacement detection
+    let inCodeBlock = false;
+    let codeBlockLines = [];
+    let hasSeenMarkersInBlock = false;
     const isFileMarker = (line) => {
         const match = line.match(/^### File:\s*[`']?([^`'\s]+)[`']?/i);
         return match ? match[1] : null;
@@ -223,11 +228,16 @@ const parseLLMPatch = (patchContent) => {
         const fileName = isFileMarker(line);
         if (fileName) {
             currentFile = fileName;
+            // Reset tracking when switching files
+            inCodeBlock = false;
+            codeBlockLines = [];
+            hasSeenMarkersInBlock = false;
             continue;
         }
         if (isSearchMarker(line)) {
             inSearch = true;
             inReplace = false;
+            hasSeenMarkersInBlock = true;
             searchLines = [];
             replaceLines = [];
             continue;
@@ -237,9 +247,11 @@ const parseLLMPatch = (patchContent) => {
                 inSearch = false;
                 inReplace = true;
             }
+            hasSeenMarkersInBlock = true;
             continue;
         }
         if (isEndMarker(line)) {
+            hasSeenMarkersInBlock = true;
             if (inReplace || inSearch) {
                 if (searchLines.length > 0 || replaceLines.length > 0) {
                     if (!filePatches[currentFile])
@@ -256,10 +268,33 @@ const parseLLMPatch = (patchContent) => {
             replaceLines = [];
             continue;
         }
+        // Detect triple backticks to identify potential full-file replacements
+        if (line.trim().startsWith("```")) {
+            if (!inCodeBlock) {
+                inCodeBlock = true;
+                codeBlockLines = [];
+                hasSeenMarkersInBlock = false;
+            }
+            else {
+                inCodeBlock = false;
+                // If the code block ended without any SEARCH/REPLACE markers, treat it as full-file code
+                if (!hasSeenMarkersInBlock && codeBlockLines.length > 0 && currentFile !== "unknown") {
+                    if (!filePatches[currentFile])
+                        filePatches[currentFile] = [];
+                    filePatches[currentFile].push({
+                        search: "__FULL_FILE_REPLACEMENT__",
+                        replace: codeBlockLines.join("\n")
+                    });
+                }
+            }
+            continue;
+        }
         if (inSearch)
             searchLines.push(line);
         else if (inReplace)
             replaceLines.push(line);
+        else if (inCodeBlock)
+            codeBlockLines.push(line);
     }
     return filePatches;
 };
@@ -274,6 +309,12 @@ const applyPatch = (originalContent, patches) => {
     let result = originalContent;
     for (const patch of patches) {
         const { search, replace } = patch;
+        // Strategy 0: Full File Replacement (Overwrite)
+        if (search === "__FULL_FILE_REPLACEMENT__") {
+            console.log(`[ApplyPatch] Overwriting file with full content.`);
+            result = replace;
+            continue;
+        }
         // NẾU SEARCH RỖNG (INSERT/APPEND)
         if (search.trim() === "") {
             console.log(`[ApplyPatch] Inserting/appending block.`);
@@ -359,30 +400,56 @@ const startServer = async (rootDir) => {
     });
     // API 3: Apply Patch
     app.post("/api/apply", async (req, res) => {
-        var _a;
         const { llmResponse, filePaths: selectedPaths } = req.body;
         // 1. Parse all patches from LLM response
         const filePatches = parseLLMPatch(llmResponse);
         // 2. Scan project files
         const allFiles = await scanRecursively(rootDir, rootDir);
         const modifiedFiles = [];
-        // 3. Match patches to files and apply
+        const appliedNormalizedPaths = new Set();
+        // 3. Match patches to existing files and apply
         for (const file of allFiles) {
-            // Find patches meant for this specific file path
-            // Note: LLM might use different path separators, so we normalize
             const normalizedPath = file.path.replace(/\\/g, '/');
-            const patchesForFile = (_a = Object.entries(filePatches).find(([path]) => {
+            const patchesEntry = Object.entries(filePatches).find(([path]) => {
                 const normalizedKey = path.replace(/\\/g, '/');
                 return normalizedKey === normalizedPath || normalizedPath.endsWith('/' + normalizedKey);
-            })) === null || _a === void 0 ? void 0 : _a[1];
-            // Only apply if the file was selected in UI AND has patches in the response
-            if (selectedPaths.includes(file.path) && patchesForFile) {
-                console.log(`[Apply] Processing ${patchesForFile.length} blocks for: ${file.path}`);
-                const newContent = (0, exports.applyPatch)(file.content, patchesForFile);
-                if (newContent !== file.content) {
-                    await promises_1.default.writeFile(file.fullPath, newContent, "utf-8");
-                    modifiedFiles.push(file.path);
+            });
+            if (patchesEntry) {
+                const [rawKey, patchesForFile] = patchesEntry;
+                // Only apply if the file was selected in UI
+                if (selectedPaths.includes(file.path)) {
+                    console.log(`[Apply] Processing ${patchesForFile.length} blocks for: ${file.path}`);
+                    const newContent = (0, exports.applyPatch)(file.content, patchesForFile);
+                    if (newContent !== file.content) {
+                        await promises_1.default.writeFile(file.fullPath, newContent, "utf-8");
+                        modifiedFiles.push(file.path);
+                    }
                 }
+                appliedNormalizedPaths.add(rawKey.replace(/\\/g, '/'));
+            }
+        }
+        // 4. Handle New Files (patches for paths that don't exist yet)
+        for (const [rawPath, patches] of Object.entries(filePatches)) {
+            const normalizedKey = rawPath.replace(/\\/g, '/');
+            if (normalizedKey === "unknown" || appliedNormalizedPaths.has(normalizedKey))
+                continue;
+            // Double check it doesn't exist (safety)
+            const alreadyExists = allFiles.some(f => {
+                const np = f.path.replace(/\\/g, '/');
+                return np === normalizedKey || np.endsWith('/' + normalizedKey);
+            });
+            if (alreadyExists)
+                continue;
+            console.log(`[Apply] Creating new file: ${rawPath}`);
+            const newContent = (0, exports.applyPatch)("", patches);
+            const fullPath = node_path_1.default.resolve(rootDir, rawPath);
+            try {
+                await promises_1.default.mkdir(node_path_1.default.dirname(fullPath), { recursive: true });
+                await promises_1.default.writeFile(fullPath, newContent, "utf-8");
+                modifiedFiles.push(rawPath);
+            }
+            catch (err) {
+                console.error(`[Apply] Failed to create file ${rawPath}:`, err);
             }
         }
         // Fallback: If no matched files but only one file was selected, try applying "unknown" patches
@@ -604,7 +671,8 @@ const startServer = async (rootDir) => {
 
               async init() {
                 try {
-                  const res = await fetch('http://localhost:${PORT}/api/files');
+                  // Sử dụng relative URL để tránh lỗi phân giải localhost/127.0.0.1 trên Windows
+                  const res = await fetch('/api/files');
                   const data = await res.json();
                   this.rawFiles = data;
                   this.buildTree();
@@ -614,98 +682,10 @@ const startServer = async (rootDir) => {
                   this.loading = false;
                 }
 
-                // Search watcher
                 this.$watch('search', () => this.buildTree());
-                
-                // Auto-generate prompt
                 this.$watch('instruction', () => this.debouncedFetchPrompt());
                 this.$watch('selectedFiles', () => this.debouncedFetchPrompt());
               },
-
-              // ===========================
-              // Tree Logic
-              // ===========================
-              
-              buildTree() {
-                // 1. Convert paths to object structure
-                const root = {};
-                const searchLower = this.search.toLowerCase();
-                
-                this.rawFiles.forEach(file => {
-                  if (this.search && !file.path.toLowerCase().includes(searchLower)) return;
-                  
-                  const parts = file.path.split(/[\\\\/]/);
-                  let current = root;
-                  
-                  parts.forEach((part, index) => {
-                    if (!current[part]) {
-                      current[part] = {
-                        name: part,
-                        path: parts.slice(0, index + 1).join('/'),
-                        children: {},
-                        type: index === parts.length - 1 ? 'file' : 'folder',
-                        fullPath: file.path // Only meaningful for file
-                      };
-                    }
-                    current = current[part].children;
-                  });
-                });
-
-                // 2. Flatten object structure into renderable list with depth
-                this.treeNodes = [];
-                const traverse = (nodeMap, depth) => {
-                  // Sort: Folders first, then Files. Alphabetical.
-                  const keys = Object.keys(nodeMap).sort((a, b) => {
-                    const nodeA = nodeMap[a];
-                    const nodeB = nodeMap[b];
-                    if (nodeA.type !== nodeB.type) return nodeA.type === 'folder' ? -1 : 1;
-                    return a.localeCompare(b);
-                  });
-
-                  keys.forEach(key => {
-                    const node = nodeMap[key];
-                    const flatNode = {
-                      id: node.path,
-                      name: node.name,
-                      path: node.path, // Relative path for selection
-                      type: node.type,
-                      depth: depth,
-                      children: Object.keys(node.children).length > 0, // boolean for UI
-                      expanded: this.search.length > 0 || depth < 1, // Auto expand on search or root
-                      rawChildren: node.children // Keep ref for recursion
-                    };
-                    
-                    this.treeNodes.push(flatNode);
-                    if (flatNode.children && flatNode.expanded) {
-                      traverse(node.children, depth + 1);
-                    }
-                  });
-                };
-                
-                traverse(root, 0);
-              },
-
-              // Re-calculate visible nodes (folding logic) without rebuilding everything
-              // But for simplicity in this SFC, we just rebuild the list when expanded changes.
-              toggleExpand(node) {
-                if (node.type !== 'folder') return;
-                
-                // Find node in treeNodes and toggle
-                // Since treeNodes is flat and generated, we need to persist state or smarter logic.
-                // Simpler: Just modify the expanded state in the current flat list is tricky because children are dynamic.
-                // Better approach for this lightweight UI:
-                // We actually need a persistent "expanded" Set to survive re-renders if we want to be fancy.
-                // For now, let's just cheat: Update the boolean in the flat list works for collapsing, 
-                // but expanding requires knowing the children.
-                
-                // Let's reload the tree logic but using a \`expandedPaths\` set.
-                if (this.expandedPaths.has(node.path)) {
-                   this.expandedPaths.delete(node.path);
-                } else {
-                   this.expandedPaths.add(node.path);
-                }
-                this.refreshTreeVisibility();
-              },
               
               // Alternative: Just use a computed property for \`visibleNodes\`.
               // Since Alpine isn't React, we do this manually.
@@ -733,7 +713,8 @@ const startServer = async (rootDir) => {
                  
                  this.rawFiles.forEach(file => {
                     if (this.search && !file.path.toLowerCase().includes(searchLower)) return;
-                    const parts = file.path.split(/[\\\\/]/);
+                    // File path đã được chuẩn hóa '/' từ backend
+                    const parts = file.path.split('/');
                     let current = this.rootObject;
                     parts.forEach((part, index) => {
                       if (!current[part]) {
@@ -834,9 +815,8 @@ const startServer = async (rootDir) => {
               },
               
               getAllDescendants(folderPath) {
-                 // Simple filter from rawFiles
                  return this.rawFiles
-                    .filter(f => f.path.startsWith(folderPath + '/') || f.path.startsWith(folderPath + '\\\\'))
+                    .filter(f => f.path === folderPath || f.path.startsWith(folderPath + '/'))
                     .map(f => f.path);
               },
 
@@ -869,7 +849,7 @@ const startServer = async (rootDir) => {
                 }
                 this.generating = true;
                 try {
-                  const res = await fetch('http://localhost:${PORT}/api/prompt', {
+                  const res = await fetch('/api/prompt', {
                     method: 'POST',
                     headers: {'Content-Type': 'application/json'},
                     body: JSON.stringify({ filePaths: Array.from(this.selectedFiles), instruction: this.instruction })
@@ -896,7 +876,7 @@ const startServer = async (rootDir) => {
               async applyPatch() {
                 this.applying = true;
                 try {
-                   const res = await fetch('http://localhost:${PORT}/api/apply', {
+                   const res = await fetch('/api/apply', {
                     method: 'POST',
                     headers: {'Content-Type': 'application/json'},
                     body: JSON.stringify({ filePaths: Array.from(this.selectedFiles), llmResponse: this.llmResponse })

package/bin/tools/vibe/patch.utils.js

@@ -0,0 +1,243 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.applyPatch = exports.parseLLMPatch = void 0;
+const diff_match_patch_1 = require("diff-match-patch");
+/**
+ * ------------------------------------------------------------------
+ * HELPER: STRING SIMILARITY (Levenshtein based)
+ * Tính độ giống nhau giữa 2 chuỗi (0 -> 1)
+ * ------------------------------------------------------------------
+ */
+const calculateSimilarity = (s1, s2) => {
+    const longer = s1.length > s2.length ? s1 : s2;
+    const shorter = s1.length > s2.length ? s2 : s1;
+    const longerLength = longer.length;
+    if (longerLength === 0) {
+        return 1.0;
+    }
+    // Sử dụng dmp để tính Levenshtein distance cho chính xác và nhanh
+    const dmp = new diff_match_patch_1.diff_match_patch();
+    const diffs = dmp.diff_main(longer, shorter);
+    const levenshtein = dmp.diff_levenshtein(diffs);
+    return (longerLength - levenshtein) / longerLength;
+};
+/**
+ * ------------------------------------------------------------------
+ * HELPER: FUZZY LINE MATCHING
+ * Tìm đoạn code khớp nhất trong file gốc dựa trên điểm số (Confidence)
+ * ------------------------------------------------------------------
+ */
+const applyFuzzyLineMatch = (original, search, replace, threshold = 0.85 // Ngưỡng chấp nhận (85% giống nhau)
+) => {
+    const originalLines = original.split(/\r?\n/);
+    const searchLines = search.split(/\r?\n/);
+    // Lọc bỏ dòng trống ở đầu/cuối search block để match chính xác hơn
+    while (searchLines.length > 0 && searchLines[0].trim() === "")
+        searchLines.shift();
+    while (searchLines.length > 0 && searchLines[searchLines.length - 1].trim() === "")
+        searchLines.pop();
+    if (searchLines.length === 0)
+        return { result: null, confidence: 0 };
+    let bestMatchIndex = -1;
+    let bestMatchScore = 0;
+    // Duyệt qua file gốc (Sliding Window)
+    // Chỉ cần duyệt đến vị trí mà số dòng còn lại đủ để chứa searchLines
+    for (let i = 0; i <= originalLines.length - searchLines.length; i++) {
+        let currentScoreTotal = 0;
+        let possible = true;
+        for (let j = 0; j < searchLines.length; j++) {
+            const originalLine = originalLines[i + j].trim();
+            const searchLine = searchLines[j].trim();
+            // So sánh nhanh: Nếu giống hệt nhau
+            if (originalLine === searchLine) {
+                currentScoreTotal += 1;
+                continue;
+            }
+            // So sánh chậm: Tính độ tương đồng
+            const similarity = calculateSimilarity(originalLine, searchLine);
+            // Nếu một dòng quá khác biệt (< 60%), coi như block này không khớp
+            // (Giúp tối ưu hiệu năng, cắt nhánh sớm)
+            if (similarity < 0.6) {
+                possible = false;
+                break;
+            }
+            currentScoreTotal += similarity;
+        }
+        if (possible) {
+            const avgScore = currentScoreTotal / searchLines.length;
+            if (avgScore > bestMatchScore) {
+                bestMatchScore = avgScore;
+                bestMatchIndex = i;
+            }
+        }
+    }
+    // LOG CONFIDENCE ĐỂ DEBUG
+    if (bestMatchScore > 0) {
+        console.log(`[FuzzyMatch] Best match score: ${(bestMatchScore * 100).toFixed(2)}% at line ${bestMatchIndex + 1}`);
+    }
+    // Nếu tìm thấy vị trí có độ tin cậy cao hơn ngưỡng
+    if (bestMatchIndex !== -1 && bestMatchScore >= threshold) {
+        const before = originalLines.slice(0, bestMatchIndex);
+        // Lưu ý: Đoạn replace thay thế đúng số lượng dòng của searchLines
+        // (Giả định search và match trong original có cùng số dòng hiển thị)
+        const after = originalLines.slice(bestMatchIndex + searchLines.length);
+        return {
+            result: [...before, replace, ...after].join("\n"),
+            confidence: bestMatchScore
+        };
+    }
+    return { result: null, confidence: bestMatchScore };
+};
+/**
+ * ------------------------------------------------------------------
+ * 1. STATE MACHINE PARSER (GIỮ NGUYÊN)
+ * ------------------------------------------------------------------
+ */
+const parseLLMPatch = (patchContent) => {
+    // ... (Code parse giữ nguyên như cũ của bạn)
+    const lines = patchContent.split(/\r?\n/);
+    const patches = [];
+    let inSearch = false;
+    let inReplace = false;
+    let searchLines = [];
+    let replaceLines = [];
+    const isSearchMarker = (line) => /^\s*<{7,}\s*SEARCH\s*$/.test(line);
+    const isDividerMarker = (line) => /^\s*={7,}\s*$/.test(line);
+    const isEndMarker = (line) => /^\s*>{7,}\s*REPLACE\s*$/.test(line);
+    for (const line of lines) {
+        if (isSearchMarker(line)) {
+            inSearch = true;
+            inReplace = false;
+            searchLines = [];
+            replaceLines = [];
+            continue;
+        }
+        if (isDividerMarker(line)) {
+            if (inSearch) {
+                inSearch = false;
+                inReplace = true;
+            }
+            continue;
+        }
+        if (isEndMarker(line)) {
+            if (inReplace || inSearch) {
+                // CẬP NHẬT: Cho phép lưu patch nếu có search HOẶC có replace
+                // (Trường hợp Search rỗng nhưng Replace có nội dung = Insert/Append)
+                if (searchLines.length > 0 || replaceLines.length > 0) {
+                    patches.push({ search: searchLines.join("\n"), replace: replaceLines.join("\n") });
+                }
+            }
+            inSearch = false;
+            inReplace = false;
+            searchLines = [];
+            replaceLines = [];
+            continue;
+        }
+        if (inSearch)
+            searchLines.push(line);
+        else if (inReplace)
+            replaceLines.push(line);
+    }
+    return patches;
+};
+exports.parseLLMPatch = parseLLMPatch;
+/**
+ * ------------------------------------------------------------------
+ * 2. APPLY PATCH (UPDATED)
+ * ------------------------------------------------------------------
+ */
+const applyPatch = (originalContent, patchContent) => {
+    let patches;
+    if (typeof patchContent === 'string') {
+        if (!patchContent || !patchContent.includes("<<<<<<< SEARCH")) {
+            return patchContent || originalContent;
+        }
+        patches = (0, exports.parseLLMPatch)(patchContent);
+    }
+    else {
+        patches = patchContent;
+    }
+    if (!patches || patches.length === 0)
+        return originalContent;
+    let result = originalContent;
+    for (const patch of patches) {
+        const { search, replace } = patch;
+        // Strategy 0: Full File Replacement (Overwrite)
+        if (search === "__FULL_FILE_REPLACEMENT__") {
+            console.log(`[ApplyPatch] Overwriting file with full content.`);
+            result = replace;
+            continue;
+        }
+        // Nếu search và replace giống hệt nhau, bỏ qua
+        if (search === replace) {
+            console.log(`[ApplyPatch] Search and replace are identical. Skipping.`);
+            continue;
+        }
+        // NẾU SEARCH RỖNG (INSERT/APPEND hoặc TẠO FILE MỚI)
+        if (search.trim() === "") {
+            console.log(`[ApplyPatch] Inserting/appending block.`);
+            if (result.trim() === "") {
+                // Nếu file hiện tại rỗng hoặc chỉ có khoảng trắng, gán luôn bằng nội dung replace (Hỗ trợ tạo file mới)
+                result = replace;
+            }
+            else {
+                // Nếu file đã có nội dung, append vào cuối. Đảm bảo có ít nhất một dấu xuống dòng phân tách.
+                const separator = result.endsWith("\n") ? "" : "\n";
+                result += separator + replace;
+            }
+            continue;
+        }
+        // --- STRATEGY 1: EXACT MATCH ---
+        if (result.includes(search)) {
+            console.log(`[ApplyPatch] Exact match found.`);
+            result = result.replace(search, replace);
+            continue;
+        }
+        // --- STRATEGY 2: NORMALIZED MATCH (Trim) ---
+        const trimmedSearch = search.trim();
+        if (result.includes(trimmedSearch)) {
+            console.log(`[ApplyPatch] Trimmed match found.`);
+            result = result.replace(trimmedSearch, replace.trim());
+            continue;
+        }
+        // --- STRATEGY 3: FUZZY LINE MATCH (BEST FOR CODE) ---
+        // Tìm vị trí tốt nhất dựa trên similarity score của từng dòng
+        const fuzzyMatch = applyFuzzyLineMatch(result, search, replace, 0.80); // 80% confidence
+        if (fuzzyMatch.result !== null) {
+            console.log(`[ApplyPatch] Fuzzy line match applied (Confidence: ${(fuzzyMatch.confidence * 100).toFixed(0)}%)`);
+            result = fuzzyMatch.result;
+            continue;
+        }
+        else {
+            console.warn(`[ApplyPatch] Failed to match block. Max confidence was: ${(fuzzyMatch.confidence * 100).toFixed(0)}%`);
+        }
+        // --- STRATEGY 4: DMP FALLBACK (LAST RESORT) ---
+        // Nếu cả fuzzy line match cũng tạch (ví dụ do search block quá ngắn hoặc cấu trúc quá nát)
+        // thì mới dùng DMP patch_apply.
+        try {
+            const dmp = new diff_match_patch_1.diff_match_patch();
+            dmp.Match_Threshold = 0.5;
+            dmp.Match_Distance = 1000;
+            const dmpPatches = dmp.patch_make(search, replace);
+            const [newText, applyResults] = dmp.patch_apply(dmpPatches, result);
+            // Kiểm tra xem có apply được hết các hunk không
+            const successCount = applyResults.filter(Boolean).length;
+            const successRate = successCount / applyResults.length;
+            if (successRate === 1 && newText !== result) {
+                console.log(`[ApplyPatch] DMP Patch applied via fuzzy logic.`);
+                result = newText;
+            }
+            else {
+                console.error(`[ApplyPatch] All strategies failed for block starting with: ${search.substring(0, 30)}...`);
+                console.log(`[ApplyPatch DATA]`, { search, replace, result });
+                // Tuỳ chọn: Throw error để báo cho LLM biết là apply thất bại
+                // throw new Error("Could not apply patch block");
+            }
+        }
+        catch (e) {
+            console.error(`[ApplyPatch] DMP error:`, e);
+        }
+    }
+    return result;
+};
+exports.applyPatch = applyPatch;