opencode-fast-apply 2.1.5 → 2.1.6

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;AA2ZvD,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;AA0avD,eAAO,MAAM,eAAe,EAAE,MA4J7B,CAAA;AAGD,eAAe,eAAe,CAAA"}

package/dist/index.js

@@ -18,18 +18,18 @@ 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.
+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.
+- 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>>>
+<code>{original_code}</code>
 
-<<<UPDATE>>>{update_snippet}<<</UPDATE>>>
+<update>{update_snippet}</update>
 
 Provide the complete updated code.`;
-const UPDATED_CODE_START = "<<<UPDATED_CODE>>>";
-const UPDATED_CODE_END = "<<</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,17 +97,27 @@ 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 unescapeXmlTags(text) {
+    return text
+        .replace(/&lt;updated-code&gt;/g, "<updated-code>")
+        .replace(/&lt;\/updated-code&gt;/g, "</updated-code>");
+}
 function extractUpdatedCode(raw) {
     const stripped = raw.trim();
     const startTag = UPDATED_CODE_START;
     const endTag = UPDATED_CODE_END;
     let startIdx = stripped.indexOf(startTag);
     if (startIdx === -1) {
-        startIdx = stripped.indexOf("<<<UPDATED_CODE");
+        startIdx = stripped.indexOf("<updated-code");
         if (startIdx !== -1) {
-            const closeTagIdx = stripped.indexOf(">>>", startIdx);
+            const closeTagIdx = stripped.indexOf(">", startIdx);
             if (closeTagIdx !== -1) {
-                startIdx = closeTagIdx + 3;
+                startIdx = closeTagIdx + 1;
             }
         }
     }
@@ -118,28 +128,28 @@ function extractUpdatedCode(raw) {
         if (stripped.startsWith("```") && stripped.endsWith("```")) {
             const lines = stripped.split("\n");
             if (lines.length >= 2) {
-                return lines.slice(1, -1).join("\n");
+                return unescapeXmlTags(lines.slice(1, -1).join("\n"));
             }
         }
-        return stripped;
+        return unescapeXmlTags(stripped);
     }
     let endIdx = stripped.indexOf(endTag, startIdx);
     if (endIdx === -1) {
-        endIdx = stripped.indexOf("<<</UPDATED_CODE", startIdx);
+        endIdx = stripped.indexOf("</updated-code", startIdx);
     }
     if (endIdx === -1) {
         const extracted = stripped.slice(startIdx).trim();
-        const lastCloseTag = extracted.lastIndexOf("<<<");
+        const lastCloseTag = extracted.lastIndexOf("</");
         if (lastCloseTag !== -1 && extracted.slice(lastCloseTag).toLowerCase().includes("update")) {
-            return extracted.slice(0, lastCloseTag).trim();
+            return unescapeXmlTags(extracted.slice(0, lastCloseTag).trim());
         }
-        return extracted;
+        return unescapeXmlTags(extracted);
     }
     const inner = stripped.substring(startIdx, endIdx);
     if (!inner || inner.trim().length === 0) {
         throw new Error("Empty updated-code block");
     }
-    return inner;
+    return unescapeXmlTags(inner);
 }
 function generateUnifiedDiff(filepath, original, modified) {
     const patch = createTwoFilesPatch(`a/${filepath}`, `b/${filepath}`, original, modified, "", "", { context: 3 });
@@ -219,9 +229,11 @@ async function callFastApply(originalCode, codeEdit, instructions) {
         };
     }
     try {
+        const escapedOriginalCode = escapeXmlTags(originalCode);
+        const escapedCodeEdit = escapeXmlTags(codeEdit);
         const userContent = FAST_APPLY_USER_PROMPT
-            .replace("{original_code}", originalCode)
-            .replace("{update_snippet}", codeEdit);
+            .replace("{original_code}", escapedOriginalCode)
+            .replace("{update_snippet}", escapedCodeEdit);
         const response = await fetch(`${FAST_APPLY_URL}/v1/chat/completions`, {
             method: "POST",
             headers: {

package/package.json

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