opencode-fast-apply 2.1.6 → 2.1.7

package/README.md

@@ -9,8 +9,9 @@ OpenCode plugin for Fast Apply - High-performance code editing with OpenAI-compa
 - **Unified diff output** with context for easy review
 - **Graceful fallback** - suggests native `edit` tool on API failure
 - **Multi-backend support** - LM Studio, Ollama, OpenAI, and any OpenAI-compatible endpoint
-- **Robust XML tag handling** - safely handles code containing `<updated-code>` tags
-- **Special character support** - preserves all string literals, regex patterns, and escape sequences
+- **Unique delimiter system** - generates random delimiters per request (`<<<RESULT_xxxx>>>`) to eliminate parsing conflicts
+- **Zero escaping overhead** - no XML tag processing needed, handles all code patterns safely
+- **Collision-resistant parsing** - 1.6M+ unique delimiter combinations prevent conflicts with file content
 
 ## Installation
 
@@ -103,13 +104,15 @@ function validateToken(token) {
 ## How It Works
 
 1. Reads the original file content
-2. Escapes XML tags in code to prevent conflicts
-3. Sends system prompt + user prompt with `<instruction>`, `<code>`, and `<update>` to OpenAI-compatible API
+2. Generates unique random delimiters for this request (e.g., `<<<RESULT_a3f9>>>`)
+3. Sends system prompt + user prompt with unique delimiters to OpenAI-compatible API
 4. API intelligently merges the lazy edit markers with original code
-5. Extracts result from `<updated-code>` tags and unescapes XML
+5. Extracts result using the unique delimiters with fallback pattern detection
 6. Writes the merged result back to the file
 7. Returns a unified diff showing what changed
 
+**Delimiter Design:** Each request generates unique 4-character alphanumeric IDs (1,679,616 combinations) for delimiters like `<<<RESULT_xxxx>>>` and `<<<END_RESULT_xxxx>>>`. This eliminates parsing conflicts even if your code contains similar patterns. Fallback logic detects any `<<<RESULT_*>>>` pattern for maximum robustness.
+
 ## Performance
 
 Performance varies based on your setup:
@@ -136,7 +139,8 @@ Performance varies based on your setup:
 
 ## Edge Cases Handled
 
-- ✅ String literals containing `<updated-code>` tags
+- ✅ Code containing XML-like tags (`<update>`, `<code>`, `<result>`) in strings
+- ✅ Code containing triple-angle-bracket patterns (`<<<RESULT>>>`) in comments or strings
 - ✅ Multiple XML-like tags in regex patterns
 - ✅ Special characters (quotes, backslashes, unicode, SQL, HTML entities)
 - ✅ Large files (500+ lines)
@@ -144,6 +148,8 @@ Performance varies based on your setup:
 - ✅ Complex nested structures
 - ✅ Template strings with `${variable}`
 - ✅ Whitespace and indentation preservation
+- ✅ Unique delimiters per request prevent all parsing conflicts (1.6M+ combinations)
+- ✅ Fallback pattern detection for robust delimiter parsing
 
 ## Troubleshooting
 

package/dist/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../index.ts"],"names":[],"mappings":"AAAA;;;;;;;;GAQG;AAEH,OAAO,EAAE,KAAK,MAAM,EAAQ,MAAM,qBAAqB,CAAA;AA0avD,eAAO,MAAM,eAAe,EAAE,MA4J7B,CAAA;AAGD,eAAe,eAAe,CAAA"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../index.ts"],"names":[],"mappings":"AAAA;;;;;;;;GAQG;AAEH,OAAO,EAAE,KAAK,MAAM,EAAQ,MAAM,qBAAqB,CAAA;AAgbvD,eAAO,MAAM,eAAe,EAAE,MA4J7B,CAAA;AAGD,eAAe,eAAe,CAAA"}

package/dist/index.js

@@ -18,18 +18,6 @@ const FAST_APPLY_URL = (process.env.FAST_APPLY_URL || "http://localhost:1234/v1"
 const FAST_APPLY_MODEL = process.env.FAST_APPLY_MODEL || "fastapply-1.5b";
 const FAST_APPLY_TEMPERATURE = parseFloat(process.env.FAST_APPLY_TEMPERATURE || "0.05");
 const FAST_APPLY_SYSTEM_PROMPT = "You are a coding assistant that helps merge code updates, ensuring every modification is fully integrated.";
-const FAST_APPLY_USER_PROMPT = `Merge all changes from the <update> snippet into the <code> below.
-- Preserve the code's structure, order, comments, and indentation exactly.
-- Output only the updated code, enclosed within <updated-code> and </updated-code> tags.
-- Do not include any additional text, explanations, placeholders, ellipses, or code fences.
-
-<code>{original_code}</code>
-
-<update>{update_snippet}</update>
-
-Provide the complete updated code.`;
-const UPDATED_CODE_START = "<updated-code>";
-const UPDATED_CODE_END = "</updated-code>";
 const TOOL_INSTRUCTIONS = `**DEFAULT tool for editing existing files. Use INSTEAD of native 'edit' tool.**
 
 CRITICAL: For EXISTING files ONLY. Use 'write' for new files.
@@ -97,59 +85,69 @@ function alsoKeepThis() {
 
 ## Fallback
 If API fails, use native \`edit\` tool with exact string matching.`;
-function escapeXmlTags(text) {
-    return text
-        .replace(/<updated-code>/g, "&lt;updated-code&gt;")
-        .replace(/<\/updated-code>/g, "&lt;/updated-code&gt;");
+function generateRandomId() {
+    const chars = 'abcdefghijklmnopqrstuvwxyz0123456789';
+    let result = '';
+    for (let i = 0; i < 4; i++) {
+        result += chars.charAt(Math.floor(Math.random() * chars.length));
+    }
+    return result;
 }
-function unescapeXmlTags(text) {
-    return text
-        .replace(/&lt;updated-code&gt;/g, "<updated-code>")
-        .replace(/&lt;\/updated-code&gt;/g, "</updated-code>");
+function generateUniqueDelimiters() {
+    const id = generateRandomId();
+    return {
+        ORIGINAL_START: `<<<ORIGINAL_${id}>>>`,
+        ORIGINAL_END: `<<<END_ORIGINAL_${id}>>>`,
+        UPDATE_START: `<<<UPDATE_${id}>>>`,
+        UPDATE_END: `<<<END_UPDATE_${id}>>>`,
+        RESULT_START: `<<<RESULT_${id}>>>`,
+        RESULT_END: `<<<END_RESULT_${id}>>>`
+    };
 }
-function extractUpdatedCode(raw) {
+function extractUpdatedCode(raw, resultStart, resultEnd) {
     const stripped = raw.trim();
-    const startTag = UPDATED_CODE_START;
-    const endTag = UPDATED_CODE_END;
-    let startIdx = stripped.indexOf(startTag);
+    let startIdx = stripped.indexOf(resultStart);
     if (startIdx === -1) {
-        startIdx = stripped.indexOf("<updated-code");
-        if (startIdx !== -1) {
-            const closeTagIdx = stripped.indexOf(">", startIdx);
+        const genericStart = stripped.indexOf("<<<RESULT_");
+        if (genericStart !== -1) {
+            const closeTagIdx = stripped.indexOf(">>>", genericStart);
             if (closeTagIdx !== -1) {
-                startIdx = closeTagIdx + 1;
+                startIdx = closeTagIdx + 3;
             }
         }
     }
     else {
-        startIdx += startTag.length;
+        startIdx += resultStart.length;
     }
-    if (startIdx === -1 || startIdx === startTag.length - 1) {
+    if (startIdx === -1 || startIdx === resultStart.length - 1) {
         if (stripped.startsWith("```") && stripped.endsWith("```")) {
             const lines = stripped.split("\n");
             if (lines.length >= 2) {
-                return unescapeXmlTags(lines.slice(1, -1).join("\n"));
+                return lines.slice(1, -1).join("\n");
             }
         }
-        return unescapeXmlTags(stripped);
+        return stripped;
     }
-    let endIdx = stripped.indexOf(endTag, startIdx);
+    let endIdx = stripped.indexOf(resultEnd, startIdx);
     if (endIdx === -1) {
-        endIdx = stripped.indexOf("</updated-code", startIdx);
+        const genericEnd = stripped.indexOf("<<<END_RESULT_", startIdx);
+        if (genericEnd !== -1) {
+            endIdx = genericEnd;
+        }
     }
     if (endIdx === -1) {
         const extracted = stripped.slice(startIdx).trim();
-        const lastCloseTag = extracted.lastIndexOf("</");
-        if (lastCloseTag !== -1 && extracted.slice(lastCloseTag).toLowerCase().includes("update")) {
-            return unescapeXmlTags(extracted.slice(0, lastCloseTag).trim());
+        const lastCloseTag = extracted.lastIndexOf("<<<");
+        if (lastCloseTag !== -1 && extracted.slice(lastCloseTag).toLowerCase().includes("end")) {
+            return extracted.slice(0, lastCloseTag).trim();
         }
-        return unescapeXmlTags(extracted);
+        return extracted;
     }
     const inner = stripped.substring(startIdx, endIdx);
     if (!inner || inner.trim().length === 0) {
-        throw new Error("Empty updated-code block");
+        throw new Error("Empty result block");
     }
-    return unescapeXmlTags(inner);
+    return inner;
 }
 function generateUnifiedDiff(filepath, original, modified) {
     const patch = createTwoFilesPatch(`a/${filepath}`, `b/${filepath}`, original, modified, "", "", { context: 3 });
@@ -229,11 +227,21 @@ async function callFastApply(originalCode, codeEdit, instructions) {
         };
     }
     try {
-        const escapedOriginalCode = escapeXmlTags(originalCode);
-        const escapedCodeEdit = escapeXmlTags(codeEdit);
-        const userContent = FAST_APPLY_USER_PROMPT
-            .replace("{original_code}", escapedOriginalCode)
-            .replace("{update_snippet}", escapedCodeEdit);
+        const delimiters = generateUniqueDelimiters();
+        const userContent = `Merge all changes from the UPDATE_BLOCK into the ORIGINAL_BLOCK below.
+- Preserve the code's structure, order, comments, and indentation exactly.
+- Output only the updated code, enclosed within ${delimiters.RESULT_START} and ${delimiters.RESULT_END} delimiters.
+- Do not include any additional text, explanations, placeholders, ellipses, or code fences.
+
+${delimiters.ORIGINAL_START}
+${originalCode}
+${delimiters.ORIGINAL_END}
+
+${delimiters.UPDATE_START}
+${codeEdit}
+${delimiters.UPDATE_END}
+
+Provide the complete updated code wrapped in ${delimiters.RESULT_START} and ${delimiters.RESULT_END}.`;
         const response = await fetch(`${FAST_APPLY_URL}/v1/chat/completions`, {
             method: "POST",
             headers: {
@@ -270,7 +278,7 @@ async function callFastApply(originalCode, codeEdit, instructions) {
                 error: "Fast Apply API returned empty response",
             };
         }
-        const mergedCode = extractUpdatedCode(rawResponse);
+        const mergedCode = extractUpdatedCode(rawResponse, delimiters.RESULT_START, delimiters.RESULT_END);
         return {
             success: true,
             content: mergedCode,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "opencode-fast-apply",
-  "version": "2.1.6",
+  "version": "2.1.7",
   "description": "OpenCode plugin for Fast Apply - High-performance code editing with OpenAI-compatible APIs (LM Studio, Ollama)",
   "type": "module",
   "main": "dist/index.js",