@o-lang/semantic-doc-search 1.0.43 → 1.1.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@o-lang/semantic-doc-search",
-  "version": "1.0.43",
+  "version": "1.1.1",
   "description": "O-Lang semantic document search resolver with vector embeddings",
   "main": "src/index.js",
   "exports": {

package/src/resolver.js

@@ -9,7 +9,7 @@ const crypto = require("crypto");
 const CACHE_PATH = path.join(process.cwd(), "embeddings.json");
 
 // ─────────────────────────────────────────────
-// Helpers (UNCHANGED)
+// Helpers
 // ─────────────────────────────────────────────
 function loadCache() {
   try {
@@ -36,94 +36,80 @@ function hashText(str) {
 }
 
 // ─────────────────────────────────────────────
-// 🔥 MAIN RESOLVER
+// 🔥 MAIN RESOLVER - Simplified: action type = resolver name
+// Format: Action vector.search "arg1" "arg2" ...
+// - 1 arg = ingest: "{doc_root}"
+// - 2+ args = search: "{query}" "{doc_root}"
 // ─────────────────────────────────────────────
 async function resolver(action, context = {}) {
   if (typeof action !== "string") return;
 
+  // Extract ALL quoted args from action string
+  const args = [...action.matchAll(/"([^"]*)"/g)].map(m => m[1]);
+  
   const vectorStore = VectorRouter.create(context);
-  const embed = await embedder({ dimension: 384 });
-
-  const doc_root = context.doc_root || "./docs";
+  const getEmbedFn = await embedder({ dimension: 384 });
   const useCache = !!context.POSTGRES_URL || !!context.REDIS_URL;
   const cache = useCache ? loadCache() : {};
 
   // =====================================================
-  // ✅ 1. VECTOR INSERT (INGEST)
+  // ✅ INGEST: 1 arg = doc_root
   // =====================================================
-  if (action.includes("vector.insert")) {
+  if (args.length === 1) {
     let inserted = 0;
+    const ingestRoot = args[0] || context.doc_root || "./docs";
 
-    if (fs.existsSync(doc_root)) {
-      const files = fs.readdirSync(doc_root);
-
+    if (fs.existsSync(ingestRoot)) {
+      const files = fs.readdirSync(ingestRoot);
       for (const file of files) {
-        const fullPath = path.join(doc_root, file);
+        const fullPath = path.join(ingestRoot, file);
         if (!fs.statSync(fullPath).isFile()) continue;
-
         const content = fs.readFileSync(fullPath, "utf8");
         if (!content) continue;
-
-        const chunkText = require("./utils/chunker").chunkText;
-        const chunks = chunkText(content, 500, 50);
-
+        const chunks = require("./utils/chunker").chunkText(content, 500, 50);
         for (let i = 0; i < chunks.length; i++) {
           const text = sanitizeTextForEmbedding(chunks[i]);
           if (!text) continue;
-
           const hash = hashText(text);
           if (useCache && cache[hash]) continue;
-
-          const rawVector = await embed(text);
-          const vector = Array.from(rawVector);
-
+          const rawVector = await getEmbedFn(text);
           await vectorStore.upsert({
             id: `${file}:${i}`,
-            vector,
+            vector: Array.from(rawVector),
             content: text,
             source: `file:${file}`,
           });
-
           if (useCache) cache[hash] = true;
           inserted++;
         }
       }
     }
-
     if (useCache) saveCache(cache);
     if (vectorStore.close) await vectorStore.close();
-
-    return { inserted, doc_root };
+    return { inserted, doc_root: ingestRoot };
   }
 
   // =====================================================
-  // ✅ 2. VECTOR SEARCH
+  // ✅ SEARCH: 2+ args = query + doc_root
   // =====================================================
-  if (action.includes("vector.search")) {
-    const query = sanitizeTextForEmbedding(extractQuery(action));
+  if (args.length >= 2) {
+    const query = sanitizeTextForEmbedding(args[0]);
     if (!query) return { text: "", matches: [] };
-
-    const rawQueryVector = await embed(query);
-    const queryVector = Array.from(rawQueryVector);
-
-    const results = await vectorStore.query(queryVector, {
-      topK: context.topK || 5,
-    });
-
+    const rawQueryVector = await getEmbedFn(query);
+    const results = await vectorStore.query(Array.from(rawQueryVector), { topK: context.topK || 5 });
     if (vectorStore.close) await vectorStore.close();
-
     return formatResults(results, query);
   }
 
   // =====================================================
-  // ❌ REMOVE THIS (legacy)
+  // ❌ Unknown action format
   // =====================================================
-  // if (action.startsWith("Ask doc-search")) { ... }
-
+  console.warn(`⚠️  Unknown vector.search action format: "${action}"`);
   return;
 }
 
-resolver.resolverName = "vector";
-resolver.version = "1.0.0";
+// ✅ Must match workflow's "Allow resolvers: - vector.search"
+resolver.resolverName = "vector.search";
+resolver.version = "1.0.42";
 
-module.exports = resolver;
+module.exports = resolver;

package/src/utils/extractQuery.js

@@ -1,18 +1,34 @@
 /**
  * Extracts the query from an O-Lang action.
- * Example:
- *   "Ask doc-search: vacation policy"
+ * 
+ * Supports formats:
+ *   - Legacy: "Ask doc-search: vacation policy"
+ *   - New:    Action doc-search "vector.search" "query" "./docs"
  */
 function extractQuery(action) {
-  const match = action.match(/ask doc-search\s*:?\s*(.+)$/i);
-
-  if (!match || !match[1]) {
-    throw new Error("Invalid doc-search action format");
+  if (!action || typeof action !== "string") {
+    throw new Error("Invalid doc-search action format: action is not a string");
   }
 
-  return match[1].trim();
+  // ✅ NEW FORMAT: Extract all quoted strings
+  const quotedMatches = [...action.matchAll(/"([^"]*)"/g)].map(m => m[1]);
+  
+  if (quotedMatches.length >= 2) {
+    // Format: "actionType" "query" "doc_root"
+    // Return the query (second quoted string)
+    return quotedMatches[1].trim();
+  }
+  
+  // ✅ LEGACY FORMAT: Ask doc-search: vacation policy
+  const legacyMatch = action.match(/ask doc-search\s*:?\s*(.+)$/i);
+  if (legacyMatch && legacyMatch[1]) {
+    return legacyMatch[1].trim();
+  }
+  
+  // ❌ Fallback error
+  throw new Error(`Invalid doc-search action format: "${action}"`);
 }
 
 module.exports = {
   extractQuery
-};
+};