opencode-fast-apply 2.1.2 → 2.1.4

package/README.md

@@ -20,16 +20,6 @@ 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):
@@ -62,7 +52,6 @@ Add to your global config (`~/.config/opencode/opencode.json` or `opencode.jsonc
 ```json
 {
   "plugin": [
-    "opencode-pty",
     "opencode-fast-apply"
   ]
 }
@@ -109,9 +98,7 @@ 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) |
-| `FAST_APPLY_MAX_TOKENS` | `8000` | Maximum tokens in response |
 
 ## How It Works
 
@@ -174,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;AA0YvD,eAAO,MAAM,eAAe,EAAE,MA2H7B,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

@@ -11,13 +11,12 @@ 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 = "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.
@@ -191,11 +190,6 @@ 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);
 }
@@ -234,8 +228,6 @@ 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);
@@ -261,11 +253,8 @@ async function callFastApply(originalCode, codeEdit, instructions) {
                     },
                 ],
                 temperature: FAST_APPLY_TEMPERATURE,
-                max_tokens: FAST_APPLY_MAX_TOKENS,
             }),
-            signal: controller.signal,
         });
-        clearTimeout(timeoutId);
         if (!response.ok) {
             const errorText = await response.text();
             return {
@@ -288,34 +277,30 @@ 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}`,
         };
     }
 }
-async function sendTUINotification(client, sessionID, filePath, workingDir, insertions, deletions, modifiedTokens) {
-    const shortPath = shortenPath(filePath, workingDir);
-    const tokenStr = formatTokenCount(modifiedTokens);
-    const message = [
-        `▣ Fast Apply | ~${tokenStr} tokens modified`,
-        "",
-        "Applied changes:",
-        `→ ${shortPath}: +${insertions} -${deletions}`
-    ].join("\n");
+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",
@@ -330,6 +315,29 @@ async function sendTUINotification(client, sessionID, filePath, workingDir, inse
         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");
@@ -338,6 +346,14 @@ export const FastApplyPlugin = async ({ directory, client }) => {
         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,
@@ -354,6 +370,7 @@ export const FastApplyPlugin = async ({ directory, client }) => {
                 },
                 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
@@ -392,7 +409,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 {
@@ -400,12 +419,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);
+                    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.2",
+  "version": "2.1.4",
   "description": "OpenCode plugin for Fast Apply - High-performance code editing with OpenAI-compatible APIs (LM Studio, Ollama)",
   "type": "module",
   "main": "dist/index.js",