opencode-rag-plugin 1.15.1 → 1.17.2

package/dist/mcp/handlers.d.ts

@@ -5,6 +5,15 @@ import type { EmbeddingProvider, VectorStore, KeywordIndex, SearchResult } from
 import type { RagConfig } from "../core/config.js";
 import { type ImageVisionProvider } from "../chunker/image.js";
 import { retrieve } from "../retriever/retriever.js";
+/**
+ * Resolve a user-supplied file path against the worktree root, refusing to
+ * escape the worktree. Absolute paths are accepted only if they already reside
+ * under the worktree; relative paths are joined to the worktree and any `..`
+ * segments that would escape are rejected.
+ *
+ * @throws {Error} if the resolved path lies outside `worktree`.
+ */
+export declare function resolveFilePath(filePath: string, worktree: string): string;
 /** Parameters for the search_semantic MCP tool. */
 export interface SearchSemanticParams {
     /** Natural language search query. */

package/dist/mcp/handlers.js

@@ -4,7 +4,26 @@ import { optimizeContext, DEFAULT_CONTEXT_OPTIMIZATION } from "../retriever/cont
 import { Parser } from "web-tree-sitter";
 import { initParser, loadLanguage, walkTree } from "../chunker/grammar.js";
 import { readFileSync } from "node:fs";
-import { resolve, isAbsolute } from "node:path";
+import { resolve, isAbsolute, relative } from "node:path";
+/**
+ * Resolve a user-supplied file path against the worktree root, refusing to
+ * escape the worktree. Absolute paths are accepted only if they already reside
+ * under the worktree; relative paths are joined to the worktree and any `..`
+ * segments that would escape are rejected.
+ *
+ * @throws {Error} if the resolved path lies outside `worktree`.
+ */
+export function resolveFilePath(filePath, worktree) {
+    const root = resolve(worktree);
+    const candidate = isAbsolute(filePath) ? resolve(filePath) : resolve(root, filePath);
+    const rel = relative(root, candidate);
+    if (rel === "")
+        return root;
+    if (rel.startsWith("..") || isAbsolute(rel)) {
+        throw new Error(`Path "${filePath}" escapes worktree root "${root}" — access denied.`);
+    }
+    return candidate;
+}
 const SKELETON_CONFIGS = {
     ".ts": { grammarName: "typescript", nodeTypes: ["function_declaration", "method_definition", "class_declaration", "interface_declaration", "type_alias_declaration", "enum_declaration"] },
     ".tsx": { grammarName: "typescript", nodeTypes: ["function_declaration", "method_definition", "class_declaration", "interface_declaration", "type_alias_declaration", "enum_declaration", "arrow_function"] },
@@ -45,11 +64,6 @@ function getExtension(filePath) {
     const dot = filePath.lastIndexOf(".");
     return dot >= 0 ? filePath.slice(dot).toLowerCase() : "";
 }
-function resolveFilePath(filePath, worktree) {
-    if (isAbsolute(filePath))
-        return filePath;
-    return resolve(worktree, filePath);
-}
 async function extractSkeleton(content, ext) {
     const config = SKELETON_CONFIGS[ext];
     if (!config) {
@@ -86,6 +100,8 @@ async function extractSkeleton(content, ext) {
         return [];
     const nodeTypes = new Set(config.nodeTypes);
     const astNodes = walkTree(tree.rootNode, nodeTypes, content, 15);
+    tree.delete();
+    parser.delete();
     return astNodes.map((node) => ({
         type: node.type,
         name: extractNodeName(node.text, node.type),
@@ -160,6 +176,7 @@ export async function handleSearchSemantic(params, embedder, store, cfg, keyword
         minScore: cfg.retrieval.minScore,
         keywordIndex,
         keywordWeight: cfg.retrieval.hybridSearch?.keywordWeight,
+        hybridEnabled: cfg.retrieval.hybridSearch?.enabled,
         queryPrefix: cfg.embedding.queryPrefix,
     };
     const rawResults = await retrieveFn_(query, embedder, store, retrieveOpts);

package/dist/mcp/server.js

@@ -95,6 +95,8 @@ export async function createMcpServer(options) {
         server,
         close: async () => {
             await server.close();
+            await ctx.store.close();
+            ctx.keywordIndex.close();
         },
     };
 }

package/dist/opencode/create-read-tool.d.ts

@@ -24,6 +24,8 @@ export interface RagReadToolOptions {
     }>;
     /** Optional keyword index for hybrid search. */
     keywordIndex?: KeywordIndex;
+    /** Maximum number of sessions to retain in the retrieval cache. */
+    maxSessionCacheSize?: number;
 }
 /**
  * Create the RAG-backed read tool for OpenCode plugin registration.

package/dist/opencode/create-read-tool.js

@@ -63,7 +63,13 @@ export function createRagReadTool(options) {
                             }
                             else {
                                 const retrievalQuery = buildSessionQuery(messageText, resolvedPath, normalized);
-                                rawResults = await retrieve(retrievalQuery, embedder, store, { topK: retrievalTopK, keywordIndex, queryPrefix: config.embedding.queryPrefix });
+                                rawResults = await retrieve(retrievalQuery, embedder, store, { topK: retrievalTopK, keywordIndex, hybridEnabled: config.retrieval.hybridSearch?.enabled, queryPrefix: config.embedding.queryPrefix });
+                                const maxSize = options.maxSessionCacheSize ?? 50;
+                                if (!sessionRetrievalCache.has(sessionID) && sessionRetrievalCache.size >= maxSize) {
+                                    const oldest = sessionRetrievalCache.keys().next().value;
+                                    if (oldest !== undefined)
+                                        sessionRetrievalCache.delete(oldest);
+                                }
                                 sessionRetrievalCache.set(sessionID, { messageText, rawResults });
                             }
                         }
@@ -74,7 +80,7 @@ export function createRagReadTool(options) {
                                 startLine: normalized.startLine,
                                 endLine: normalized.endLine,
                             });
-                            rawResults = await retrieve(retrievalQuery, embedder, store, { topK: retrievalTopK, keywordIndex, queryPrefix: config.embedding.queryPrefix });
+                            rawResults = await retrieve(retrievalQuery, embedder, store, { topK: retrievalTopK, keywordIndex, hybridEnabled: config.retrieval.hybridSearch?.enabled, queryPrefix: config.embedding.queryPrefix });
                         }
                         // Collect related files from raw results (before filtering)
                         relatedFiles = collectRelatedFiles(rawResults, resolvedPath, readRelatedFilesMax);

package/dist/opencode/read-fallback.d.ts

@@ -1,12 +1,8 @@
 /**
  * @fileoverview Provides fallback error messages and no-results behavior dispatch for the read tool.
  */
-import type { ReadNoResultsBehavior } from "../core/config.js";
 /**
  * Error message wrapper for retrieval failures.
  */
 export declare function retrievalErrorMessage(shortError: string): string;
-/**
- * Dispatch to the correct fallback message based on behavior config.
- */
-export declare function getNoResultsMessage(behavior: ReadNoResultsBehavior, filePath?: string): string;
+/** No results fallback messages are handled inline in create-read-tool.ts. */

package/dist/opencode/read-fallback.js

@@ -12,22 +12,5 @@ export function retrievalErrorMessage(shortError) {
         shortError,
     ].join("\n");
 }
-/**
- * Dispatch to the correct fallback message based on behavior config.
- */
-export function getNoResultsMessage(behavior, filePath) {
-    switch (behavior) {
-        case "error":
-            throw new Error("OpenCodeRAG read: no indexed chunks found." +
-                (filePath ? ` File: ${filePath}` : ""));
-        case "empty":
-            return "No indexed chunks found.";
-        case "hint":
-        default:
-            if (filePath) {
-                return `No indexed chunks found for ${filePath}.`;
-            }
-            return "No relevant chunks found.";
-    }
-}
+/** No results fallback messages are handled inline in create-read-tool.ts. */
 //# sourceMappingURL=read-fallback.js.map

package/dist/opencode/read-format.js

@@ -124,9 +124,11 @@ function formatChunk(index, result) {
     lines.push(`Score: ${score.toFixed(4)}`);
     lines.push("");
     lines.push("```" + language);
-    lines.push(chunk.content);
-    if (!chunk.content.endsWith("\n")) {
-        // Ensure code block closes on its own line
+    if (chunk.content.endsWith("\n")) {
+        lines.push(chunk.content.slice(0, -1));
+    }
+    else {
+        lines.push(chunk.content);
     }
     lines.push("```");
     return lines.join("\n");

package/dist/opencode/tools.js

@@ -19,7 +19,7 @@ import { retrieve } from "../retriever/retriever.js";
 import { Parser } from "web-tree-sitter";
 import { initParser, loadLanguage, walkTree } from "../chunker/grammar.js";
 import { readFileSync } from "node:fs";
-import { resolve, isAbsolute } from "node:path";
+import { resolveWorkspacePath } from "./tool-args.js";
 const SKELETON_CONFIGS = {
     ".ts": { grammarName: "typescript", nodeTypes: ["function_declaration", "method_definition", "class_declaration", "interface_declaration", "type_alias_declaration", "enum_declaration"] },
     ".tsx": { grammarName: "typescript", nodeTypes: ["function_declaration", "method_definition", "class_declaration", "interface_declaration", "type_alias_declaration", "enum_declaration", "arrow_function"] },
@@ -68,9 +68,7 @@ function getExtension(filePath) {
  * Resolve a file path relative to the workspace root.
  */
 function resolveFilePath(filePath, worktree) {
-    if (isAbsolute(filePath))
-        return filePath;
-    return resolve(worktree, filePath);
+    return resolveWorkspacePath(worktree, filePath);
 }
 /**
  * Extract structural outline from source code using tree-sitter.
@@ -116,6 +114,8 @@ async function extractSkeleton(content, ext) {
         return [];
     const nodeTypes = new Set(config.nodeTypes);
     const astNodes = walkTree(tree.rootNode, nodeTypes, content, 15);
+    tree.delete();
+    parser.delete();
     return astNodes.map((node) => ({
         type: node.type,
         name: extractNodeName(node.text, node.type),
@@ -262,9 +262,7 @@ export function createDescribeImageTool(options) {
             try {
                 const { existsSync, readFileSync } = await import("node:fs");
                 const path = await import("node:path");
-                const resolvedPath = isAbsolute(args.filePath)
-                    ? args.filePath
-                    : resolve(worktree, args.filePath);
+                const resolvedPath = resolveWorkspacePath(worktree, args.filePath);
                 if (!existsSync(resolvedPath)) {
                     return {
                         title: "Describe image",