context-mode 0.9.15 → 0.9.16

package/.claude-plugin/marketplace.json

@@ -13,7 +13,7 @@
       "name": "context-mode",
       "source": "./",
       "description": "Claude Code MCP plugin that saves 98% of your context window. Sandboxed code execution in 11 languages, FTS5 knowledge base with BM25 ranking, and intent-driven search.",
-      "version": "0.9.15",
+      "version": "0.9.16",
       "author": {
         "name": "Mert Koseoğlu"
       },

package/.claude-plugin/plugin.json

@@ -1,6 +1,6 @@
 {
   "name": "context-mode",
-  "version": "0.9.15",
+  "version": "0.9.16",
   "description": "Claude Code MCP plugin that saves 98% of your context window. Sandboxed code execution in 11 languages, FTS5 knowledge base with BM25 ranking, and intent-driven search.",
   "author": {
     "name": "Mert Koseoğlu",

package/build/server.d.ts

@@ -1,2 +1,8 @@
 #!/usr/bin/env node
-export {};
+/**
+ * Parse FTS5 highlight markers to find match positions in the
+ * original (marker-free) text. Returns character offsets into the
+ * stripped content where each matched token begins.
+ */
+export declare function positionsFromHighlight(highlighted: string): number[];
+export declare function extractSnippet(content: string, query: string, maxLen?: number, highlighted?: string): string;

package/build/server.js

@@ -51,25 +51,76 @@ const bunNote = hasBunRuntime()
 // ─────────────────────────────────────────────────────────
 // Helper: smart snippet extraction — returns windows around
 // matching query terms instead of dumb truncation
+//
+// When `highlighted` is provided (from FTS5 `highlight()` with
+// STX/ETX markers), match positions are derived from the markers.
+// This is the authoritative source — FTS5 uses the exact same
+// tokenizer that produced the BM25 match, so stemmed variants
+// like "configuration" matching query "configure" are found
+// correctly. Falls back to indexOf on raw terms when highlighted
+// is absent (non-FTS codepath).
 // ─────────────────────────────────────────────────────────
-function extractSnippet(content, query, maxLen = 1500) {
+const STX = "\x02";
+const ETX = "\x03";
+/**
+ * Parse FTS5 highlight markers to find match positions in the
+ * original (marker-free) text. Returns character offsets into the
+ * stripped content where each matched token begins.
+ */
+export function positionsFromHighlight(highlighted) {
+    const positions = [];
+    let cleanOffset = 0;
+    let i = 0;
+    while (i < highlighted.length) {
+        if (highlighted[i] === STX) {
+            // Record position of this match in the clean text
+            positions.push(cleanOffset);
+            i++; // skip STX
+            // Advance through matched text until ETX
+            while (i < highlighted.length && highlighted[i] !== ETX) {
+                cleanOffset++;
+                i++;
+            }
+            if (i < highlighted.length)
+                i++; // skip ETX
+        }
+        else {
+            cleanOffset++;
+            i++;
+        }
+    }
+    return positions;
+}
+/** Strip STX/ETX markers to recover original content. */
+function stripMarkers(highlighted) {
+    return highlighted.replaceAll(STX, "").replaceAll(ETX, "");
+}
+export function extractSnippet(content, query, maxLen = 1500, highlighted) {
     if (content.length <= maxLen)
         return content;
-    const terms = query
-        .toLowerCase()
-        .split(/\s+/)
-        .filter((t) => t.length > 2);
-    const lower = content.toLowerCase();
-    // Find all positions where query terms appear
+    // Derive match positions from FTS5 highlight markers when available
     const positions = [];
-    for (const term of terms) {
-        let idx = lower.indexOf(term);
-        while (idx !== -1) {
-            positions.push(idx);
-            idx = lower.indexOf(term, idx + 1);
+    if (highlighted) {
+        for (const pos of positionsFromHighlight(highlighted)) {
+            positions.push(pos);
+        }
+    }
+    // Fallback: indexOf on raw query terms (non-FTS codepath)
+    if (positions.length === 0) {
+        const terms = query
+            .toLowerCase()
+            .split(/\s+/)
+            .filter((t) => t.length > 2);
+        const lower = content.toLowerCase();
+        for (const term of terms) {
+            let idx = lower.indexOf(term);
+            while (idx !== -1) {
+                positions.push(idx);
+                idx = lower.indexOf(term, idx + 1);
+            }
         }
     }
-    // No term matches — return start (BM25 matched on stems/variants)
+    // No matches at all — return prefix
     if (positions.length === 0) {
         return content.slice(0, maxLen) + "\n…";
     }
@@ -541,7 +592,7 @@ server.registerTool("search", {
                 .map((r, i) => {
                 const header = `--- [${r.source}] ---`;
                 const heading = `### ${r.title}`;
-                const snippet = extractSnippet(r.content, q);
+                const snippet = extractSnippet(r.content, q, 1500, r.highlighted);
                 return `${header}\n${heading}\n\n${snippet}`;
             })
                 .join("\n\n");
@@ -822,7 +873,7 @@ server.registerTool("batch_execute", {
             queryResults.push("");
             if (results.length > 0) {
                 for (const r of results) {
-                    const snippet = extractSnippet(r.content, query);
+                    const snippet = extractSnippet(r.content, query, 1500, r.highlighted);
                     queryResults.push(`### ${r.title}`);
                     queryResults.push(snippet);
                     queryResults.push("");

package/build/store.d.ts

@@ -20,6 +20,7 @@ export interface SearchResult {
     rank: number;
     contentType: "code" | "prose";
     matchLayer?: "porter" | "trigram" | "fuzzy";
+    highlighted?: string;
 }
 export interface StoreStats {
     sources: number;

package/build/store.js

@@ -271,7 +271,8 @@ export class ContentStore {
         chunks.content,
         chunks.content_type,
         sources.label,
-        bm25(chunks, 2.0, 1.0) AS rank
+        bm25(chunks, 2.0, 1.0) AS rank,
+        highlight(chunks, 1, char(2), char(3)) AS highlighted
       FROM chunks
       JOIN sources ON sources.id = chunks.source_id
       WHERE chunks MATCH ? ${sourceFilter}
@@ -288,6 +289,7 @@ export class ContentStore {
             source: r.label,
             rank: r.rank,
             contentType: r.content_type,
+            highlighted: r.highlighted,
         }));
     }
     // ── Trigram Search (Layer 2) ──
@@ -302,7 +304,8 @@ export class ContentStore {
         chunks_trigram.content,
         chunks_trigram.content_type,
         sources.label,
-        bm25(chunks_trigram, 2.0, 1.0) AS rank
+        bm25(chunks_trigram, 2.0, 1.0) AS rank,
+        highlight(chunks_trigram, 1, char(2), char(3)) AS highlighted
       FROM chunks_trigram
       JOIN sources ON sources.id = chunks_trigram.source_id
       WHERE chunks_trigram MATCH ? ${sourceFilter}
@@ -319,6 +322,7 @@ export class ContentStore {
             source: r.label,
             rank: r.rank,
             contentType: r.content_type,
+            highlighted: r.highlighted,
         }));
     }
     // ── Fuzzy Correction (Layer 3) ──

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "context-mode",
-  "version": "0.9.15",
+  "version": "0.9.16",
   "type": "module",
   "description": "Claude Code MCP plugin that saves 98% of your context window. Sandboxed code execution, FTS5 knowledge base, and intent-driven search.",
   "author": "Mert Koseoğlu",