memorix 1.2.4 → 1.2.5

package/dist/index.js

@@ -2803,6 +2803,25 @@ function getResolvedConfig(options = {}) {
   const legacy = loadFileConfig();
   const embeddingBaseUrl = first(process.env.MEMORIX_EMBEDDING_BASE_URL, toml.embedding?.base_url, yaml2.embedding?.baseUrl, legacy.embeddingApi?.baseUrl);
   const openRouterEmbeddingApiKey = isOpenRouterUrl(embeddingBaseUrl) ? process.env.OPENROUTER_API_KEY : void 0;
+  const memoryLlmProvider = first(
+    process.env.MEMORIX_LLM_PROVIDER,
+    toml.memory?.llm?.provider,
+    yaml2.llm?.provider,
+    legacy.llm?.provider
+  );
+  const memoryLlmModel = first(
+    process.env.MEMORIX_LLM_MODEL,
+    toml.memory?.llm?.model,
+    yaml2.llm?.model,
+    legacy.llm?.model
+  );
+  const memoryLlmBaseUrl = first(
+    process.env.MEMORIX_LLM_BASE_URL,
+    toml.memory?.llm?.base_url,
+    yaml2.llm?.baseUrl,
+    legacy.llm?.baseUrl
+  );
+  const openRouterMemoryLlmApiKey = isOpenRouterMemoryLane(memoryLlmProvider, memoryLlmBaseUrl) ? process.env.OPENROUTER_API_KEY : void 0;
   const resolved = {
     agent: {
       provider: first(
@@ -2840,9 +2859,9 @@ function getResolvedConfig(options = {}) {
       autoCleanup: firstBool(toml.memory?.auto_cleanup, yaml2.behavior?.autoCleanup),
       syncAdvisory: firstBool(toml.memory?.sync_advisory, yaml2.behavior?.syncAdvisory),
       llm: {
-        provider: first(process.env.MEMORIX_LLM_PROVIDER, toml.memory?.llm?.provider, yaml2.llm?.provider, legacy.llm?.provider),
-        model: first(process.env.MEMORIX_LLM_MODEL, toml.memory?.llm?.model, yaml2.llm?.model, legacy.llm?.model),
-        baseUrl: first(process.env.MEMORIX_LLM_BASE_URL, toml.memory?.llm?.base_url, yaml2.llm?.baseUrl, legacy.llm?.baseUrl),
+        provider: memoryLlmProvider,
+        model: memoryLlmModel,
+        baseUrl: memoryLlmBaseUrl,
         apiKey: first(
           process.env.MEMORIX_LLM_API_KEY,
           process.env.MEMORIX_API_KEY,
@@ -2851,7 +2870,7 @@ function getResolvedConfig(options = {}) {
           legacy.llm?.apiKey,
           process.env.OPENAI_API_KEY,
           process.env.ANTHROPIC_API_KEY,
-          process.env.OPENROUTER_API_KEY
+          openRouterMemoryLlmApiKey
         )
       }
     },
@@ -2988,6 +3007,9 @@ function isOpenRouterUrl(value) {
     return /(^|\.)openrouter\.ai(?::|\/|$)/i.test(value);
   }
 }
+function isOpenRouterMemoryLane(provider2, baseUrl) {
+  return provider2?.trim().toLowerCase() === "openrouter" || isOpenRouterUrl(baseUrl);
+}
 function normalizeExternalContext(value) {
   const normalized = value?.trim().toLowerCase();
   if (normalized === "auto" || normalized === "off") return normalized;
@@ -5035,6 +5057,29 @@ Rules:
   }
 });
 
+// src/timeout.ts
+function withTimeout(promise, ms, label) {
+  return new Promise((resolve2, reject) => {
+    const timer = setTimeout(() => reject(new Error(`${label} timed out after ${ms}ms`)), ms);
+    promise.then(
+      (value) => {
+        clearTimeout(timer);
+        resolve2(value);
+      },
+      (error) => {
+        clearTimeout(timer);
+        reject(error);
+      }
+    );
+  });
+}
+var init_timeout = __esm({
+  "src/timeout.ts"() {
+    "use strict";
+    init_esm_shims();
+  }
+});
+
 // src/project/aliases.ts
 var aliases_exports = {};
 __export(aliases_exports, {
@@ -5800,8 +5845,12 @@ async function searchObservations(options) {
     }
   };
   const modeKey = options.projectId ?? SEARCH_MODE_DEFAULT_KEY;
-  lastSearchModeByProject.set(modeKey, embeddingEnabled ? "hybrid" : "fulltext");
+  const quality = options.quality ?? "balanced";
   const database = await getDb();
+  lastSearchModeByProject.set(
+    modeKey,
+    quality === "fast" ? "fulltext (fast profile)" : embeddingEnabled ? "hybrid" : "fulltext"
+  );
   let projectIds = null;
   if (options.projectId) {
     try {
@@ -5823,11 +5872,15 @@ async function searchObservations(options) {
   }
   const hasQuery = options.query && options.query.trim().length > 0;
   const originalQuery = options.query;
-  const tier = hasQuery ? classifyQueryTier(originalQuery) : "fast";
+  const tier = quality === "fast" ? "fast" : hasQuery ? classifyQueryTier(originalQuery) : "fast";
   mark(`tier=${tier}`);
-  const expandedEmbeddingQuery = tier === "heavy" ? await maybeExpandSearchQuery(options.query) : options.query;
+  if (quality === "thorough" && hasQuery) {
+    const { initLLM: initLLM2, isLLMEnabled: isLLMEnabled2 } = await Promise.resolve().then(() => (init_provider2(), provider_exports2));
+    if (!isLLMEnabled2()) initLLM2();
+  }
+  const expandedEmbeddingQuery = quality === "thorough" && tier === "heavy" ? await maybeExpandSearchQuery(options.query) : options.query;
   mark("queryExpansion");
-  const intentResult = hasQuery ? detectQueryIntent(originalQuery) : null;
+  const intentResult = quality === "fast" || !hasQuery ? null : detectQueryIntent(originalQuery);
   const requestLimit = projectIds ? (options.limit ?? 20) * 3 : options.limit ?? 20;
   const defaultBoost = {
     title: 3,
@@ -5841,17 +5894,21 @@ async function searchObservations(options) {
   let searchParams = {
     term: originalQuery,
     limit: requestLimit,
-    includeVectors: true,
+    // Fast search never uses vectors, so returning them only adds work and
+    // payload pressure to an explicitly latency-sensitive path.
+    includeVectors: quality !== "fast",
     ...Object.keys(filters).length > 0 ? { where: filters } : {},
     // Search specific fields (not tokens, accessCount, etc.)
     properties: ["title", "entityName", "narrative", "facts", "concepts", "filesModified"],
     // Field boosting: intent-aware or default
     boost: fieldBoost,
     // Fuzzy tolerance: allow 1-char typos for short queries, 2 for longer
-    ...hasQuery ? { tolerance: originalQuery.length > 6 ? 2 : 1 } : {}
+    // Fuzzy matching is useful for ordinary recall, but grows sharply with
+    // corpus size. The fast profile deliberately uses exact lexical matching.
+    ...hasQuery && quality !== "fast" ? { tolerance: originalQuery.length > 6 ? 2 : 1 } : {}
   };
   let queryVector = null;
-  if (embeddingEnabled && hasQuery && tier !== "fast") {
+  if (quality !== "fast" && embeddingEnabled && hasQuery && tier !== "fast") {
     try {
       const provider2 = await getEmbeddingProvider();
       if (provider2) {
@@ -5866,11 +5923,11 @@ async function searchObservations(options) {
           );
         } else {
           const EMBEDDING_TIMEOUT_MS = 15e3;
-          const embedPromise = provider2.embed(expandedEmbeddingQuery);
-          const timeoutPromise = new Promise(
-            (_, reject) => setTimeout(() => reject(new Error(`Embedding timeout after ${EMBEDDING_TIMEOUT_MS}ms`)), EMBEDDING_TIMEOUT_MS)
+          queryVector = await withTimeout(
+            provider2.embed(expandedEmbeddingQuery),
+            EMBEDDING_TIMEOUT_MS,
+            "Embedding"
           );
-          queryVector = await Promise.race([embedPromise, timeoutPromise]);
           mark("embedding");
           const cjkRatio = (originalQuery.match(/[\u4e00-\u9fff\u3040-\u309f\u30a0-\u30ff\uac00-\ud7af]/g) || []).length / originalQuery.length;
           const isCJKHeavy = cjkRatio > 0.3;
@@ -6111,7 +6168,7 @@ async function searchObservations(options) {
       }
     }
   }
-  const shouldRerank = tier === "heavy" && hasQuery && intermediate.length > 2 && (() => {
+  const shouldRerank = quality === "thorough" && tier === "heavy" && hasQuery && intermediate.length > 2 && (() => {
     const top = intermediate[0]?.score ?? 0;
     const second = intermediate[1]?.score ?? 0;
     return top > 0 && second / top > 0.7;
@@ -6135,11 +6192,11 @@ async function searchObservations(options) {
       }));
       const _parsedRerank = parseInt(process.env.MEMORIX_RERANK_TIMEOUT_MS || "", 10);
       const RERANK_TIMEOUT_MS = Number.isFinite(_parsedRerank) && _parsedRerank > 0 ? _parsedRerank : 5e3;
-      const rerankPromise = rerankResults2(originalQuery, candidates);
-      const timeoutPromise = new Promise(
-        (_, reject) => setTimeout(() => reject(new Error(`LLM rerank timeout after ${RERANK_TIMEOUT_MS}ms`)), RERANK_TIMEOUT_MS)
+      const { reranked, usedLLM } = await withTimeout(
+        rerankResults2(originalQuery, candidates),
+        RERANK_TIMEOUT_MS,
+        "LLM rerank"
       );
-      const { reranked, usedLLM } = await Promise.race([rerankPromise, timeoutPromise]);
       mark(`rerank(usedLLM=${usedLLM})`);
       if (usedLLM) {
         lastSearchModeByProject.set(modeKey, (lastSearchModeByProject.get(modeKey) ?? "fulltext") + " + LLM rerank");
@@ -6331,6 +6388,7 @@ var init_orama_store = __esm({
     init_project_affinity();
     init_intent_detector();
     init_query_expansion();
+    init_timeout();
     db = null;
     dbInitPromise = null;
     dbGeneration = 0;
@@ -14855,21 +14913,6 @@ async function loadWorkspaceForMaintenance(projectId, projectDir2, mode) {
   ]);
   return versioned ?? local;
 }
-function withTimeout(promise, ms, label) {
-  return new Promise((resolve2, reject) => {
-    const timer = setTimeout(() => reject(new Error(`${label} timed out after ${ms}ms`)), ms);
-    promise.then(
-      (value) => {
-        clearTimeout(timer);
-        resolve2(value);
-      },
-      (error) => {
-        clearTimeout(timer);
-        reject(error);
-      }
-    );
-  });
-}
 async function runAutomaticConsolidation(projectId, projectDir2, options) {
   const { isLLMEnabled: isLLMEnabled2 } = await Promise.resolve().then(() => (init_provider2(), provider_exports2));
   if (!isLLMEnabled2()) {
@@ -15254,6 +15297,7 @@ var init_project_maintenance = __esm({
     init_esm_shims();
     init_isolated_maintenance();
     init_lifecycle();
+    init_timeout();
     DEFAULT_VECTOR_BATCH_SIZE = 12;
     DEFAULT_RETENTION_BATCH_SIZE = 100;
     DEFAULT_CONSOLIDATION_BATCH_SIZE = 200;
@@ -26889,18 +26933,10 @@ function parseFormationTimeoutMs(raw) {
 }
 
 // src/server.ts
+init_timeout();
 var FORMATION_TIMEOUT_MS = parseFormationTimeoutMs(process.env.MEMORIX_FORMATION_TIMEOUT_MS);
 var COMPACT_ON_WRITE_TIMEOUT_MS = 12e3;
 var COMPRESSION_TIMEOUT_MS = 5e3;
-function withTimeout2(promise, ms, label) {
-  let timer;
-  return Promise.race([
-    promise,
-    new Promise((_, reject) => {
-      timer = setTimeout(() => reject(new Error(`${label} timed out after ${ms}ms`)), ms);
-    })
-  ]).finally(() => clearTimeout(timer));
-}
 function formatFormationStageDurations(stageDurationsMs) {
   const orderedStages = ["extract", "resolve", "evaluate"];
   const parts = orderedStages.filter((stage) => stageDurationsMs[stage] !== void 0).map((stage) => `${stage}=${stageDurationsMs[stage]}ms`);
@@ -27276,7 +27312,7 @@ The path should point to a directory containing a .git folder.`
   };
   const server = existingServer ?? new McpServer({
     name: "memorix",
-    version: true ? "1.2.4" : "1.0.1"
+    version: true ? "1.2.5" : "1.0.1"
   });
   const originalRegisterTool = server.registerTool.bind(server);
   server.registerTool = ((name, ...args) => {
@@ -27473,7 +27509,7 @@ The path should point to a directory containing a .git folder.`
                 getEntityNames: () => graphManager.getEntityNames(),
                 onStageEvent: onFormationStageEvent
               };
-              formationResult = await withTimeout2(
+              formationResult = await withTimeout(
                 runFormation({
                   entityName,
                   type,
@@ -27594,7 +27630,7 @@ ${modeIcon} Formation[active]: ${formationResult.evaluation.category} (${formati
                   facts: d.facts,
                   score: similarEntries[i]?.score ?? 0
                 }));
-                const decision = await withTimeout2(
+                const decision = await withTimeout(
                   compactOnWrite(
                     { title, narrative, facts: safeFacts ?? [] },
                     existingMemories
@@ -27690,7 +27726,7 @@ Mode: ${decision.usedLLM ? "LLM" : "heuristic"}`
           let compressionNote = "";
           try {
             const { compressNarrative: compressNarrative2 } = await Promise.resolve().then(() => (init_quality(), quality_exports));
-            const { compressed, saved, usedLLM } = await withTimeout2(
+            const { compressed, saved, usedLLM } = await withTimeout(
               compressNarrative2(narrative, safeFacts, type),
               COMPRESSION_TIMEOUT_MS,
               "Narrative compression"
@@ -27812,7 +27848,7 @@ Auto-enriched: ${enrichmentParts.join(", ")}` : "";
                 },
                 getEntityNames: () => graphManager.getEntityNames()
               };
-              const formed = await withTimeout2(
+              const formed = await withTimeout(
                 runFormation({ entityName, type, title, narrative, facts: safeFacts, projectId: project.id, source: "explicit", topicKey }, formationConfig),
                 FORMATION_TIMEOUT_MS,
                 "Shadow formation"
@@ -27903,6 +27939,9 @@ Use this as the \`topicKey\` parameter in \`memorix_store\` to enable upsert beh
         source: z2.enum(["agent", "git", "manual"]).optional().describe(
           'Filter by memory source. "git" returns only commit-derived ground truth memories. Omit for all sources.'
         ),
+        quality: z2.enum(["fast", "balanced", "thorough"]).optional().default("balanced").describe(
+          "Retrieval profile: fast stays local, balanced uses configured embeddings, thorough explicitly permits optional LLM refinement."
+        ),
         purpose: z2.string().optional().describe(
           "Why this must expand beyond the latest Autopilot brief. Name the missing fact or the user's explicit request."
         ),
@@ -27911,7 +27950,7 @@ Use this as the \`topicKey\` parameter in \`memorix_store\` to enable upsert beh
         )
       }
     },
-    async ({ query, limit, type, maxTokens, scope, since, until, status, source, purpose, force }) => {
+    async ({ query, limit, type, maxTokens, scope, since, until, status, source, quality, purpose, force }) => {
       if (scope !== "global") {
         const unresolved = requireResolvedProject("search the current project");
         if (unresolved) return unresolved;
@@ -27936,16 +27975,14 @@ Use this as the \`topicKey\` parameter in \`memorix_store\` to enable upsert beh
           projectId: scope === "global" ? void 0 : project.id,
           status: status ?? "active",
           source,
+          quality,
           reader: getObservationReader(scope === "global" ? "global" : "project")
         });
-        const timeoutPromise = new Promise(
-          (_, reject) => setTimeout(() => reject(new Error(`Search timeout after ${TIMEOUT_MS}ms`)), TIMEOUT_MS)
-        );
         let result;
         try {
-          result = await Promise.race([searchPromise, timeoutPromise]);
+          result = await withTimeout(searchPromise, TIMEOUT_MS, "Search");
         } catch (error) {
-          if (error instanceof Error && error.message.includes("timeout")) {
+          if (error instanceof Error && /\btimeout\b|timed out/i.test(error.message)) {
             return {
               content: [
                 {