@joshuaswarren/openclaw-engram 9.0.75 → 9.0.77

package/dist/index.js

@@ -6697,6 +6697,16 @@ ${stderr}`.split("\n").map((s) => s.trim()).filter((s) => s.length > 0);
   supportsExplainTraces() {
     return versionAtLeast(parseQmdVersion(this.cliVersion), [1, 1, 2]);
   }
+  /**
+   * QMD v2 (>= 2.0.0) uses a new MCP tool API:
+   * - `search` and `vsearch` tools removed; only `query` tool exists
+   * - `query` accepts `{ searches: [{ type, query }], collections?: string[] }`
+   *   instead of `{ query: string, collection?: string }`
+   * - `collection` (singular) → `collections` (plural array)
+   */
+  isQmdV2() {
+    return versionAtLeast(parseQmdVersion(this.cliVersion), [2, 0, 0]);
+  }
   resolveSearchOptions(options) {
     const normalized = normalizeSearchOptions(options);
     if (!normalized) return void 0;
@@ -6842,29 +6852,43 @@ ${stderr}`.split("\n").map((s) => s.trim()).filter((s) => s.length > 0);
   async searchViaDaemon(query, collection, maxResults, options, signal) {
     if (!this.daemonSession || !this.daemonAvailable) return null;
     const startedAtMs = Date.now();
+    const v2 = this.isQmdV2();
     try {
-      const args = {
-        query,
-        limit: maxResults
-      };
-      if (collection) {
-        args.collection = collection;
-      }
-      if (options?.intent) {
-        args.intent = options.intent;
-      }
-      if (options?.explain === true) {
-        args.explain = true;
+      let args;
+      if (v2) {
+        const searches = [{ type: "lex", query }];
+        searches.push({ type: "vec", query });
+        args = { searches, limit: maxResults };
+        if (collection) {
+          args.collections = [collection];
+        }
+        if (options?.intent) {
+          args.intent = options.intent;
+        }
+        if (options?.explain === true) {
+          args.explain = true;
+        }
+      } else {
+        args = { query, limit: maxResults };
+        if (collection) {
+          args.collection = collection;
+        }
+        if (options?.intent) {
+          args.intent = options.intent;
+        }
+        if (options?.explain === true) {
+          args.explain = true;
+        }
       }
       const result = await this.daemonSession.callTool("query", args, QMD_DAEMON_TIMEOUT_MS, signal);
       const durationMs = Date.now() - startedAtMs;
       if (this.slowLog?.enabled && durationMs >= this.slowLog.thresholdMs) {
         log.warn(
-          `SLOW QMD daemon query: durationMs=${durationMs} collection=${collection ?? "global"} maxResults=${maxResults} queryChars=${query.length}`
+          `SLOW QMD daemon query: durationMs=${durationMs} collection=${collection ?? "global"} maxResults=${maxResults} queryChars=${query.length} v2=${v2}`
         );
       }
       const results = parseMcpSearchResult(result, "daemon");
-      log.debug(`QMD daemon search: ${results.length} results in ${durationMs}ms`);
+      log.debug(`QMD daemon search: ${results.length} results in ${durationMs}ms (v2=${v2})`);
       this.recordDaemonSuccess();
       return results;
     } catch (err) {
@@ -6884,16 +6908,31 @@ ${stderr}`.split("\n").map((s) => s.trim()).filter((s) => s.length > 0);
   async bm25SearchViaDaemon(query, collection, maxResults, signal) {
     if (!this.daemonSession || !this.daemonAvailable) return null;
     const startedAtMs = Date.now();
+    const v2 = this.isQmdV2();
     try {
-      const result = await this.daemonSession.callTool(
-        "search",
-        { query, limit: maxResults, collection },
-        QMD_DAEMON_TIMEOUT_MS,
-        signal
-      );
+      let result;
+      if (v2) {
+        result = await this.daemonSession.callTool(
+          "query",
+          {
+            searches: [{ type: "lex", query }],
+            collections: [collection],
+            limit: maxResults
+          },
+          QMD_DAEMON_TIMEOUT_MS,
+          signal
+        );
+      } else {
+        result = await this.daemonSession.callTool(
+          "search",
+          { query, limit: maxResults, collection },
+          QMD_DAEMON_TIMEOUT_MS,
+          signal
+        );
+      }
       const durationMs = Date.now() - startedAtMs;
       const results = parseMcpSearchResult(result);
-      log.debug(`QMD daemon bm25: ${results.length} results in ${durationMs}ms`);
+      log.debug(`QMD daemon bm25: ${results.length} results in ${durationMs}ms (v2=${v2})`);
       this.recordDaemonSuccess();
       return results;
     } catch (err) {
@@ -6913,16 +6952,31 @@ ${stderr}`.split("\n").map((s) => s.trim()).filter((s) => s.length > 0);
   async vsearchViaDaemon(query, collection, maxResults, signal) {
     if (!this.daemonSession || !this.daemonAvailable) return null;
     const startedAtMs = Date.now();
+    const v2 = this.isQmdV2();
     try {
-      const result = await this.daemonSession.callTool(
-        "vsearch",
-        { query, limit: maxResults, collection },
-        QMD_DAEMON_TIMEOUT_MS,
-        signal
-      );
+      let result;
+      if (v2) {
+        result = await this.daemonSession.callTool(
+          "query",
+          {
+            searches: [{ type: "vec", query }],
+            collections: [collection],
+            limit: maxResults
+          },
+          QMD_DAEMON_TIMEOUT_MS,
+          signal
+        );
+      } else {
+        result = await this.daemonSession.callTool(
+          "vsearch",
+          { query, limit: maxResults, collection },
+          QMD_DAEMON_TIMEOUT_MS,
+          signal
+        );
+      }
       const durationMs = Date.now() - startedAtMs;
       const results = parseMcpSearchResult(result);
-      log.debug(`QMD daemon vsearch: ${results.length} results in ${durationMs}ms`);
+      log.debug(`QMD daemon vsearch: ${results.length} results in ${durationMs}ms (v2=${v2})`);
       this.recordDaemonSuccess();
       return results;
     } catch (err) {
@@ -39896,7 +39950,7 @@ import path69 from "path";
 import os6 from "os";
 
 // src/opik-exporter.ts
-import { createHash as createHash13, randomUUID as randomUUID3 } from "crypto";
+import { createHash as createHash13, randomBytes } from "crypto";
 import { readFileSync as readFileSync4 } from "fs";
 import os5 from "os";
 import path68 from "path";
@@ -39919,6 +39973,20 @@ function readOpikOpenclawConfig(log2) {
     return {};
   }
 }
+function uuidV7() {
+  const now = Date.now();
+  const bytes = randomBytes(16);
+  bytes[0] = now / 2 ** 40 & 255;
+  bytes[1] = now / 2 ** 32 & 255;
+  bytes[2] = now / 2 ** 24 & 255;
+  bytes[3] = now / 2 ** 16 & 255;
+  bytes[4] = now / 2 ** 8 & 255;
+  bytes[5] = now & 255;
+  bytes[6] = bytes[6] & 15 | 112;
+  bytes[8] = bytes[8] & 63 | 128;
+  const hex = bytes.toString("hex");
+  return `${hex.slice(0, 8)}-${hex.slice(8, 12)}-${hex.slice(12, 16)}-${hex.slice(16, 20)}-${hex.slice(20)}`;
+}
 function buildHeaders(cfg) {
   const headers = { "Content-Type": "application/json" };
   if (cfg.workspaceName) headers["Comet-Workspace"] = cfg.workspaceName;
@@ -40049,8 +40117,8 @@ var OpikExporter = class _OpikExporter {
     }
     if (evt.timings) metadata.timings = evt.timings;
     const span = {
-      id: randomUUID3(),
-      trace_id: evt.sessionKey ? this.sessionToTraceId(evt.sessionKey) : randomUUID3(),
+      id: uuidV7(),
+      trace_id: evt.sessionKey ? this.sessionToTraceId(evt.sessionKey) : uuidV7(),
       project_name: this.cfg.projectName,
       name: "engram:recall",
       type: "general",
@@ -40095,8 +40163,8 @@ var OpikExporter = class _OpikExporter {
     if (evt.tokenUsage?.output != null) usage.completion_tokens = evt.tokenUsage.output;
     if (evt.tokenUsage?.total != null) usage.total_tokens = evt.tokenUsage.total;
     const span = {
-      id: state?.spanId ?? randomUUID3(),
-      trace_id: state?.traceId ?? randomUUID3(),
+      id: state?.spanId ?? uuidV7(),
+      trace_id: state?.traceId ?? uuidV7(),
       project_name: this.cfg.projectName,
       name: `engram:${evt.operation}`,
       type: "llm",
@@ -40119,13 +40187,15 @@ var OpikExporter = class _OpikExporter {
   // Helpers
   // -------------------------------------------------------------------------
   /**
-   * Convert a sessionKey to a stable UUID v5-like deterministic ID so that
+   * Convert a sessionKey to a stable, deterministic UUID v7-shaped ID so that
    * spans for the same session share a trace_id and are threaded in Opik.
-   * Uses SHA-256 so sessions with similar keys produce distinct trace IDs.
+   * Uses SHA-256 for collision resistance. The timestamp bytes (0-5) come from
+   * the hash itself — they don't reflect real time, but Opik only validates
+   * the version/variant bits, not timestamp ordering.
    */
   sessionToTraceId(sessionKey) {
     const digest = createHash13("sha256").update(sessionKey).digest();
-    digest[6] = digest[6] & 15 | 64;
+    digest[6] = digest[6] & 15 | 112;
     digest[8] = digest[8] & 63 | 128;
     const hex = digest.slice(0, 16).toString("hex");
     return `${hex.slice(0, 8)}-${hex.slice(8, 12)}-${hex.slice(12, 16)}-${hex.slice(16, 20)}-${hex.slice(20)}`;