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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@o-lang/semantic-doc-search",
-  "version": "1.0.43",
+  "version": "1.1.0",
   "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 {
@@ -35,30 +35,62 @@ function hashText(str) {
   return crypto.createHash("sha256").update(str).digest("hex");
 }
 
+// ─────────────────────────────────────────────
+// 🔥 Parse O-Lang Action String
+// Format: Action <resolver> "<actionType>" "<arg1>" "<arg2>" ...
+// ─────────────────────────────────────────────
+function parseActionString(action) {
+  if (!action || typeof action !== "string") return null;
+  
+  // Remove "Action doc-search " prefix if present
+  const cleaned = action.replace(/^Action\s+doc-search\s+/, "").trim();
+  
+  // Extract quoted strings: "vector.search" "query" "./docs"
+  const matches = [...cleaned.matchAll(/"([^"]*)"/g)].map(m => m[1]);
+  
+  if (matches.length < 1) return null;
+  
+  return {
+    actionType: matches[0],           // "vector.search" or "vector.insert"
+    args: matches.slice(1),           // remaining args
+    raw: action
+  };
+}
+
 // ─────────────────────────────────────────────
 // 🔥 MAIN RESOLVER
 // ─────────────────────────────────────────────
 async function resolver(action, context = {}) {
   if (typeof action !== "string") return;
 
+  // Parse the action string
+  const parsed = parseActionString(action);
+  if (!parsed) {
+    console.error("❌ Invalid doc-search action format:", action);
+    throw new Error("Invalid doc-search action format");
+  }
+
+  const { actionType, args } = parsed;
+  
   const vectorStore = VectorRouter.create(context);
-  const embed = await embedder({ dimension: 384 });
+  const getEmbedFn = await embedder({ dimension: 384 });
 
-  const doc_root = context.doc_root || "./docs";
+  const doc_root = context.doc_root || args[1] || "./docs";
   const useCache = !!context.POSTGRES_URL || !!context.REDIS_URL;
   const cache = useCache ? loadCache() : {};
 
   // =====================================================
   // ✅ 1. VECTOR INSERT (INGEST)
   // =====================================================
-  if (action.includes("vector.insert")) {
+  if (actionType.includes("vector.insert")) {
     let inserted = 0;
+    const ingestRoot = args[0] || doc_root;
 
-    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");
@@ -74,7 +106,7 @@ async function resolver(action, context = {}) {
           const hash = hashText(text);
           if (useCache && cache[hash]) continue;
 
-          const rawVector = await embed(text);
+          const rawVector = await getEmbedFn(text);
           const vector = Array.from(rawVector);
 
           await vectorStore.upsert({
@@ -93,17 +125,17 @@ async function resolver(action, context = {}) {
     if (useCache) saveCache(cache);
     if (vectorStore.close) await vectorStore.close();
 
-    return { inserted, doc_root };
+    return { inserted, doc_root: ingestRoot };
   }
 
   // =====================================================
   // ✅ 2. VECTOR SEARCH
   // =====================================================
-  if (action.includes("vector.search")) {
-    const query = sanitizeTextForEmbedding(extractQuery(action));
+  if (actionType.includes("vector.search")) {
+    const query = sanitizeTextForEmbedding(args[0] || extractQuery(action) || "");
     if (!query) return { text: "", matches: [] };
 
-    const rawQueryVector = await embed(query);
+    const rawQueryVector = await getEmbedFn(query);
     const queryVector = Array.from(rawQueryVector);
 
     const results = await vectorStore.query(queryVector, {
@@ -116,14 +148,13 @@ async function resolver(action, context = {}) {
   }
 
   // =====================================================
-  // ❌ REMOVE THIS (legacy)
+  // ❌ Unknown action
   // =====================================================
-  // if (action.startsWith("Ask doc-search")) { ... }
-
+  console.warn(`⚠️  Unknown doc-search action: "${actionType}"`);
   return;
 }
 
-resolver.resolverName = "vector";
-resolver.version = "1.0.0";
+resolver.resolverName = "doc-search";
+resolver.version = "1.0.42";
 
 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
-};
+};