opencode-fast-apply 2.1.0 → 2.1.3

package/README.md

@@ -20,35 +20,25 @@ OpenCode plugin for Fast Apply - High-performance code editing with OpenAI-compa
 npm install -g opencode-fast-apply
 ```
 
-Or add to your OpenCode config to auto-install:
-
-```json
-{
-  "plugin": [
-    "opencode-fast-apply"
-  ]
-}
-```
-
 ### 2. Configure your API endpoint
 
 For **LM Studio** (default):
 ```bash
-export FAST_APPLY_URL="http://localhost:1234/v1"
+export FAST_APPLY_URL="http://localhost:1234"
 export FAST_APPLY_MODEL="fastapply-1.5b"
 export FAST_APPLY_API_KEY="optional-api-key"
 ```
 
 For **Ollama**:
 ```bash
-export FAST_APPLY_URL="http://localhost:11434/v1"
+export FAST_APPLY_URL="http://localhost:11434"
 export FAST_APPLY_MODEL="codellama:7b"
 export FAST_APPLY_API_KEY="optional-api-key"
 ```
 
 For **OpenAI**:
 ```bash
-export FAST_APPLY_URL="https://api.openai.com/v1"
+export FAST_APPLY_URL="https://api.openai.com"
 export FAST_APPLY_MODEL="gpt-4"
 export FAST_APPLY_API_KEY="sk-your-openai-key"
 ```
@@ -62,7 +52,6 @@ Add to your global config (`~/.config/opencode/opencode.json` or `opencode.jsonc
 ```json
 {
   "plugin": [
-    "opencode-pty",
     "opencode-fast-apply"
   ]
 }
@@ -111,7 +100,6 @@ function validateToken(token) {
 | `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) |
-| `FAST_APPLY_MAX_TOKENS` | `8000` | Maximum tokens in response |
 
 ## How It Works
 

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

package/dist/index.js

@@ -11,20 +11,24 @@ import { tool } from "@opencode-ai/plugin";
 import { createTwoFilesPatch } from "diff";
 import { readFile, writeFile, access } from "fs/promises";
 import { constants } from "fs";
+const sessionParamsCache = new Map();
 // Get API key from environment (set in mcpm/jarvis config)
 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_MAX_TOKENS = parseInt(process.env.FAST_APPLY_MAX_TOKENS || "8000", 10);
-const FAST_APPLY_SYSTEM_PROMPT = "Merge code edits into original files. Preserve structure, indentation, and comments exactly.";
-const FAST_APPLY_USER_PROMPT = `Task: {instruction}
+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>
 
-Output complete merged code in <updated-code></updated-code> tags. No explanations, markdown, or ellipses.`;
+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.**
@@ -106,9 +110,22 @@ function unescapeXmlTags(text) {
 }
 function extractUpdatedCode(raw) {
     const stripped = raw.trim();
-    const start = stripped.indexOf(UPDATED_CODE_START);
-    const end = stripped.lastIndexOf(UPDATED_CODE_END);
-    if (start === -1 || end === -1 || end <= start) {
+    const startTag = UPDATED_CODE_START;
+    const endTag = UPDATED_CODE_END;
+    let startIdx = stripped.indexOf(startTag);
+    if (startIdx === -1) {
+        startIdx = stripped.indexOf("<updated-code");
+        if (startIdx !== -1) {
+            const closeTagIdx = stripped.indexOf(">", startIdx);
+            if (closeTagIdx !== -1) {
+                startIdx = closeTagIdx + 1;
+            }
+        }
+    }
+    else {
+        startIdx += startTag.length;
+    }
+    if (startIdx === -1 || startIdx === startTag.length - 1) {
         if (stripped.startsWith("```") && stripped.endsWith("```")) {
             const lines = stripped.split("\n");
             if (lines.length >= 2) {
@@ -117,7 +134,19 @@ function extractUpdatedCode(raw) {
         }
         return unescapeXmlTags(stripped);
     }
-    const inner = stripped.substring(start + UPDATED_CODE_START.length, end);
+    let endIdx = stripped.indexOf(endTag, startIdx);
+    if (endIdx === -1) {
+        endIdx = stripped.indexOf("</updated-code", startIdx);
+    }
+    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());
+        }
+        return unescapeXmlTags(extracted);
+    }
+    const inner = stripped.substring(startIdx, endIdx);
     if (!inner || inner.trim().length === 0) {
         throw new Error("Empty updated-code block");
     }
@@ -162,30 +191,20 @@ function shortenPath(filePath, workingDir) {
     }
     return filePath;
 }
-function truncate(str, maxLen = 80) {
-    if (str.length <= maxLen)
-        return str;
-    return str.slice(0, maxLen - 3) + "...";
-}
 function estimateTokens(text) {
     return Math.ceil(text.length / 4);
 }
 function formatFastApplyResult(filePath, workingDir, insertions, deletions, diffPreview, modifiedTokens) {
     const shortPath = shortenPath(filePath, workingDir);
     const tokenStr = formatTokenCount(modifiedTokens);
-    const diffLines = diffPreview.split("\n");
-    const previewLines = diffLines.slice(0, 10);
-    const truncatedDiff = previewLines.join("\n");
-    const hasMore = diffLines.length > 10;
     const lines = [
         "✓ Fast Apply complete",
         "",
-        "Applied changes:",
-        `→ ${shortPath}`,
-        `  +${insertions} lines, -${deletions} lines (~${tokenStr} tokens modified)`,
+        `File: ${shortPath}`,
+        `Changes: +${insertions} -${deletions} (~${tokenStr} tokens)`,
         "",
-        "Diff preview (first 10 lines):",
-        truncatedDiff + (hasMore ? "\n..." : "")
+        "Unified diff:",
+        diffPreview
     ];
     return lines.join("\n");
 }
@@ -194,8 +213,8 @@ function formatErrorOutput(error, filePath, workingDir) {
     return [
         "✗ Fast Apply failed",
         "",
-        `→ ${shortPath}`,
-        `  Error: ${truncate(error, 100)}`,
+        `File: ${shortPath}`,
+        `Error: ${error}`,
         "",
         "Fallback: Use native 'edit' tool with exact string matching"
     ].join("\n");
@@ -216,7 +235,6 @@ async function callFastApply(originalCode, codeEdit, instructions) {
         const escapedOriginalCode = escapeXmlTags(originalCode);
         const escapedCodeEdit = escapeXmlTags(codeEdit);
         const userContent = FAST_APPLY_USER_PROMPT
-            .replace("{instruction}", instructions || "Apply the requested code changes.")
             .replace("{original_code}", escapedOriginalCode)
             .replace("{update_snippet}", escapedCodeEdit);
         const response = await fetch(`${FAST_APPLY_URL}/v1/chat/completions`, {
@@ -238,7 +256,6 @@ async function callFastApply(originalCode, codeEdit, instructions) {
                     },
                 ],
                 temperature: FAST_APPLY_TEMPERATURE,
-                max_tokens: FAST_APPLY_MAX_TOKENS,
             }),
             signal: controller.signal,
         });
@@ -279,7 +296,61 @@ async function callFastApply(originalCode, codeEdit, instructions) {
         };
     }
 }
-export const FastApplyPlugin = async ({ directory }) => {
+async function sendTUIMessage(client, sessionID, message, params) {
+    const agent = params.agent || undefined;
+    const variant = params.variant || undefined;
+    const model = params.providerId && params.modelId
+        ? {
+            providerID: params.providerId,
+            modelID: params.modelId,
+        }
+        : undefined;
+    try {
+        await client.session.prompt({
+            path: { id: sessionID },
+            body: {
+                noReply: true,
+                agent: agent,
+                model: model,
+                variant: variant,
+                parts: [
+                    {
+                        type: "text",
+                        text: message,
+                        ignored: true,
+                    },
+                ],
+            },
+        });
+    }
+    catch (error) {
+        console.error("[fast-apply] Failed to send TUI notification:", error.message);
+    }
+}
+async function sendTUINotification(client, sessionID, filePath, workingDir, insertions, deletions, modifiedTokens, params) {
+    const shortPath = shortenPath(filePath, workingDir);
+    const tokenStr = formatTokenCount(modifiedTokens);
+    const message = [
+        `▣ Fast Apply | ~${tokenStr} tokens modified`,
+        "",
+        "Applied changes:",
+        `→ ${shortPath}: +${insertions} -${deletions}`
+    ].join("\n");
+    await sendTUIMessage(client, sessionID, message, params);
+}
+async function sendTUIErrorNotification(client, sessionID, filePath, workingDir, errorMessage, params) {
+    const shortPath = shortenPath(filePath, workingDir);
+    const message = [
+        `✗ Fast Apply Error`,
+        "",
+        `File: ${shortPath}`,
+        `Error: ${errorMessage}`,
+        "",
+        "Fallback: Use native 'edit' tool"
+    ].join("\n");
+    await sendTUIMessage(client, sessionID, message, params);
+}
+export const FastApplyPlugin = async ({ directory, client }) => {
     if (!FAST_APPLY_API_KEY) {
         console.warn("[fast-apply] FAST_APPLY_API_KEY not set - fast_apply_edit tool will be disabled");
     }
@@ -287,6 +358,14 @@ export const FastApplyPlugin = async ({ directory }) => {
         console.log(`[fast-apply] Plugin loaded with model: ${FAST_APPLY_MODEL} at ${FAST_APPLY_URL}`);
     }
     return {
+        "chat.message": async (input) => {
+            sessionParamsCache.set(input.sessionID, {
+                agent: input.agent,
+                providerId: input.model?.providerID,
+                modelId: input.model?.modelID,
+                variant: input.variant,
+            });
+        },
         tool: {
             fast_apply_edit: tool({
                 description: TOOL_INSTRUCTIONS,
@@ -301,8 +380,9 @@ export const FastApplyPlugin = async ({ directory }) => {
                         .string()
                         .describe('The code changes with "// ... existing code ..." markers for unchanged sections'),
                 },
-                async execute(args) {
+                async execute(args, toolCtx) {
                     const { target_filepath, instructions, code_edit } = args;
+                    const params = sessionParamsCache.get(toolCtx.sessionID) || {};
                     // Resolve file path relative to project directory
                     const filepath = target_filepath.startsWith("/")
                         ? target_filepath
@@ -341,7 +421,9 @@ write({
                     // Call OpenAI API to merge the edit
                     const result = await callFastApply(originalCode, code_edit, instructions);
                     if (!result.success || !result.content) {
-                        return formatErrorOutput(result.error || "Unknown error", target_filepath, directory);
+                        const errorMsg = result.error || "Unknown error";
+                        await sendTUIErrorNotification(client, toolCtx.sessionID, target_filepath, directory, errorMsg, params);
+                        return formatErrorOutput(errorMsg, target_filepath, directory);
                     }
                     const mergedCode = result.content;
                     try {
@@ -349,11 +431,13 @@ write({
                     }
                     catch (err) {
                         const error = err;
+                        await sendTUIErrorNotification(client, toolCtx.sessionID, target_filepath, directory, error.message, params);
                         return formatErrorOutput(error.message, target_filepath, directory);
                     }
                     const diff = generateUnifiedDiff(target_filepath, originalCode, mergedCode);
                     const { added, removed } = countChanges(diff);
                     const modifiedTokens = estimateTokens(diff);
+                    await sendTUINotification(client, toolCtx.sessionID, target_filepath, directory, added, removed, modifiedTokens, params);
                     return formatFastApplyResult(target_filepath, directory, added, removed, diff, modifiedTokens);
                 },
             }),

package/package.json

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