opencode-fast-apply 2.1.3 → 2.1.5

package/README.md

@@ -98,7 +98,6 @@ function validateToken(token) {
 | `FAST_APPLY_API_KEY` | `optional-api-key` | API key (optional for local servers) |
 | `FAST_APPLY_URL` | `http://localhost:1234/v1` | OpenAI-compatible API endpoint |
 | `FAST_APPLY_MODEL` | `fastapply-1.5b` | Model name |
-| `FAST_APPLY_TIMEOUT` | `30000` | Request timeout in ms |
 | `FAST_APPLY_TEMPERATURE` | `0.05` | Temperature (0.0-2.0) |
 
 ## How It Works
@@ -162,12 +161,6 @@ curl -X POST http://localhost:1234/v1/chat/completions \
 - Use Q4 quantization for faster inference
 - Increase `FAST_APPLY_MAX_TOKENS` if responses are truncated
 
-### Timeout Errors
-```bash
-# Increase timeout for slower hardware
-export FAST_APPLY_TIMEOUT="60000"  # 60 seconds
-```
-
 ## Contributing
 
 Contributions welcome! This plugin could potentially be integrated into OpenCode core.

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

package/dist/index.js

@@ -16,21 +16,20 @@ const sessionParamsCache = new Map();
 const FAST_APPLY_API_KEY = process.env.FAST_APPLY_API_KEY || "optional-api-key";
 const FAST_APPLY_URL = (process.env.FAST_APPLY_URL || "http://localhost:1234/v1").replace(/\/v1\/?$/, "");
 const FAST_APPLY_MODEL = process.env.FAST_APPLY_MODEL || "fastapply-1.5b";
-const FAST_APPLY_TIMEOUT = parseInt(process.env.FAST_APPLY_TIMEOUT || "30000", 10);
 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.
@@ -98,27 +97,17 @@ 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 + 1;
+                startIdx = closeTagIdx + 3;
             }
         }
     }
@@ -129,28 +118,28 @@ function extractUpdatedCode(raw) {
         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);
     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 unescapeXmlTags(extracted.slice(0, lastCloseTag).trim());
+            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");
     }
-    return unescapeXmlTags(inner);
+    return inner;
 }
 function generateUnifiedDiff(filepath, original, modified) {
     const patch = createTwoFilesPatch(`a/${filepath}`, `b/${filepath}`, original, modified, "", "", { context: 3 });
@@ -229,14 +218,10 @@ async function callFastApply(originalCode, codeEdit, instructions) {
             error: "FAST_APPLY_API_KEY not set. Get one at https://openai.com/api",
         };
     }
-    const controller = new AbortController();
-    const timeoutId = setTimeout(() => controller.abort(), FAST_APPLY_TIMEOUT);
     try {
-        const escapedOriginalCode = escapeXmlTags(originalCode);
-        const escapedCodeEdit = escapeXmlTags(codeEdit);
         const userContent = FAST_APPLY_USER_PROMPT
-            .replace("{original_code}", escapedOriginalCode)
-            .replace("{update_snippet}", escapedCodeEdit);
+            .replace("{original_code}", originalCode)
+            .replace("{update_snippet}", codeEdit);
         const response = await fetch(`${FAST_APPLY_URL}/v1/chat/completions`, {
             method: "POST",
             headers: {
@@ -257,9 +242,7 @@ async function callFastApply(originalCode, codeEdit, instructions) {
                 ],
                 temperature: FAST_APPLY_TEMPERATURE,
             }),
-            signal: controller.signal,
         });
-        clearTimeout(timeoutId);
         if (!response.ok) {
             const errorText = await response.text();
             return {
@@ -282,14 +265,7 @@ async function callFastApply(originalCode, codeEdit, instructions) {
         };
     }
     catch (err) {
-        clearTimeout(timeoutId);
         const error = err;
-        if (error.name === "AbortError") {
-            return {
-                success: false,
-                error: `Fast Apply API timeout after ${FAST_APPLY_TIMEOUT}ms`,
-            };
-        }
         return {
             success: false,
             error: `Fast Apply API request failed: ${error.message}`,

package/package.json

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