memorix 1.4.6 → 1.5.1

package/src/store/orama-store.ts

@@ -23,7 +23,7 @@ import {
 import { calculateProjectAffinity, extractProjectKeywords, type AffinityContext, type MemoryContent } from './project-affinity.js';
 import { detectQueryIntent, applyIntentBoost } from '../search/intent-detector.js';
 import { maybeExpandSearchQuery } from '../search/query-expansion.js';
-import { withTimeout } from '../timeout.js';
+import { withTimeout, withTimeoutSignal } from '../timeout.js';
 
 let db: AnyOrama | null = null;
 let dbInitPromise: Promise<AnyOrama> | null = null;
@@ -642,18 +642,20 @@ export async function searchObservations(options: SearchOptions): Promise<IndexE
         } else {
           // Embedding timeout: 15 seconds
           const EMBEDDING_TIMEOUT_MS = 15000;
-          queryVector = await withTimeout(
-            provider.embedInput
+          queryVector = await withTimeoutSignal(
+            (signal) => provider.embedInput
               ? provider.embedInput(
                 { modality: 'text', text: expandedEmbeddingQuery! },
-                { intent: 'query', timeoutMs: EMBEDDING_TIMEOUT_MS, retry: false },
+                { intent: 'query', timeoutMs: EMBEDDING_TIMEOUT_MS, retry: false, signal },
               )
               : provider.embed(expandedEmbeddingQuery!, {
                 timeoutMs: EMBEDDING_TIMEOUT_MS,
                 retry: false,
+                signal,
               }),
             EMBEDDING_TIMEOUT_MS,
             'Embedding',
+            options.signal,
           );
           mark('embedding');
           // Detect CJK-heavy queries: BM25 can't tokenize Chinese/Japanese/Korean well

package/src/store/persistence-json.ts

@@ -1,212 +1,212 @@
-/**
- * JSON Persistence Helpers — Migration / Export / Debug Only
- *
- * These functions read/write JSON/JSONL files for one-time migration
- * from legacy storage formats into SQLite, or for export/import and debug.
- *
- * NOT used as runtime canonical store — SQLite is the sole canonical backend.
- */
-
-import { promises as fs } from 'node:fs';
-import path from 'node:path';
-import { atomicWriteFile } from './file-lock.js';
-
-/**
- * Get the file path for the knowledge graph JSONL file.
- * (MCP-compatible format, same as official Memory Server)
- */
-export function getGraphFilePath(projectDir: string): string {
-  return path.join(projectDir, 'graph.jsonl');
-}
-
-/**
- * Save the knowledge graph in JSONL format (MCP-compatible).
- * Each line is a JSON object with type: "entity" or "relation".
- *
- * Format adopted from MCP Official Memory Server.
- */
-export async function saveGraphJsonl(
-  projectDir: string,
-  entities: Array<{ name: string; entityType: string; observations: string[] }>,
-  relations: Array<{ from: string; to: string; relationType: string }>,
-): Promise<void> {
-  const lines = [
-    ...entities.map((e) =>
-      JSON.stringify({ type: 'entity', name: e.name, entityType: e.entityType, observations: e.observations }),
-    ),
-    ...relations.map((r) =>
-      JSON.stringify({ type: 'relation', from: r.from, to: r.to, relationType: r.relationType }),
-    ),
-  ];
-  await atomicWriteFile(getGraphFilePath(projectDir), lines.join('\n'));
-}
-
-/**
- * Load the knowledge graph from JSONL format.
- */
-export async function loadGraphJsonl(
-  projectDir: string,
-): Promise<{
-  entities: Array<{ name: string; entityType: string; observations: string[] }>;
-  relations: Array<{ from: string; to: string; relationType: string }>;
-}> {
-  const filePath = getGraphFilePath(projectDir);
-  try {
-    const data = await fs.readFile(filePath, 'utf-8');
-    const lines = data.split('\n').filter((line) => line.trim() !== '');
-    return lines.reduce(
-      (graph, line) => {
-        const item = JSON.parse(line);
-        if (item.type === 'entity') {
-          graph.entities.push({
-            name: item.name,
-            entityType: item.entityType,
-            observations: item.observations,
-          });
-        }
-        if (item.type === 'relation') {
-          graph.relations.push({
-            from: item.from,
-            to: item.to,
-            relationType: item.relationType,
-          });
-        }
-        return graph;
-      },
-      {
-        entities: [] as Array<{ name: string; entityType: string; observations: string[] }>,
-        relations: [] as Array<{ from: string; to: string; relationType: string }>
-      },
-    );
-  } catch (error) {
-    if (error instanceof Error && 'code' in error && (error as NodeJS.ErrnoException).code === 'ENOENT') {
-      return { entities: [], relations: [] };
-    }
-    throw error;
-  }
-}
-
-/**
- * Save observation data as JSON (for Orama restore / export).
- */
-export async function saveObservationsJson(
-  projectDir: string,
-  observations: unknown[],
-): Promise<void> {
-  const filePath = path.join(projectDir, 'observations.json');
-  await atomicWriteFile(filePath, JSON.stringify(observations, null, 2));
-}
-
-/**
- * Load observation data from JSON.
- */
-export async function loadObservationsJson(projectDir: string): Promise<unknown[]> {
-  const filePath = path.join(projectDir, 'observations.json');
-  try {
-    const data = await fs.readFile(filePath, 'utf-8');
-    return JSON.parse(data);
-  } catch (error) {
-    if (error instanceof Error && 'code' in error && (error as NodeJS.ErrnoException).code === 'ENOENT') {
-      return [];
-    }
-    throw error;
-  }
-}
-
-/**
- * Save the next observation ID counter (legacy JSON format).
- */
-export async function saveIdCounter(projectDir: string, nextId: number): Promise<void> {
-  const filePath = path.join(projectDir, 'counter.json');
-  await atomicWriteFile(filePath, JSON.stringify({ nextId }));
-}
-
-/**
- * Load the next observation ID counter (legacy JSON format).
- * For runtime use, prefer the SQLite meta table via SqliteBackend.
- */
-export async function loadIdCounter(projectDir: string): Promise<number> {
-  const filePath = path.join(projectDir, 'counter.json');
-  try {
-    const data = await fs.readFile(filePath, 'utf-8');
-    return JSON.parse(data).nextId ?? 1;
-  } catch {
-    return 1;
-  }
-}
-
-/**
- * Save mini-skills data as JSON (migration source only).
- */
-export async function saveMiniSkillsJson(
-  projectDir: string,
-  skills: unknown[],
-): Promise<void> {
-  const filePath = path.join(projectDir, 'mini-skills.json');
-  await atomicWriteFile(filePath, JSON.stringify(skills, null, 2));
-}
-
-/**
- * Load mini-skills data from JSON (migration source only).
- */
-export async function loadMiniSkillsJson(projectDir: string): Promise<unknown[]> {
-  const filePath = path.join(projectDir, 'mini-skills.json');
-  try {
-    const data = await fs.readFile(filePath, 'utf-8');
-    const parsed = JSON.parse(data);
-    return Array.isArray(parsed) ? parsed : [];
-  } catch (error) {
-    if (error instanceof Error && 'code' in error && (error as NodeJS.ErrnoException).code === 'ENOENT') {
-      return [];
-    }
-    throw error;
-  }
-}
-
-/**
- * Load the mini-skills ID counter (legacy JSON format).
- */
-export async function loadMiniSkillsCounter(projectDir: string): Promise<number> {
-  const filePath = path.join(projectDir, 'mini-skills-counter.json');
-  try {
-    const data = await fs.readFile(filePath, 'utf-8');
-    return JSON.parse(data).nextId ?? 1;
-  } catch {
-    return 1;
-  }
-}
-
-/**
- * Save the mini-skills ID counter (legacy JSON format).
- */
-export async function saveMiniSkillsCounter(projectDir: string, nextId: number): Promise<void> {
-  const filePath = path.join(projectDir, 'mini-skills-counter.json');
-  await atomicWriteFile(filePath, JSON.stringify({ nextId }));
-}
-
-/**
- * Save sessions data as JSON (migration source only).
- */
-export async function saveSessionsJson(
-  projectDir: string,
-  sessions: unknown[],
-): Promise<void> {
-  const filePath = path.join(projectDir, 'sessions.json');
-  await atomicWriteFile(filePath, JSON.stringify(sessions, null, 2));
-}
-
-/**
- * Load sessions data from JSON (migration source only).
- */
-export async function loadSessionsJson(projectDir: string): Promise<unknown[]> {
-  const filePath = path.join(projectDir, 'sessions.json');
-  try {
-    const data = await fs.readFile(filePath, 'utf-8');
-    return JSON.parse(data);
-  } catch (error) {
-    if (error instanceof Error && 'code' in error && (error as NodeJS.ErrnoException).code === 'ENOENT') {
-      return [];
-    }
-    throw error;
-  }
-}
+/**
+ * JSON Persistence Helpers — Migration / Export / Debug Only
+ *
+ * These functions read/write JSON/JSONL files for one-time migration
+ * from legacy storage formats into SQLite, or for export/import and debug.
+ *
+ * NOT used as runtime canonical store — SQLite is the sole canonical backend.
+ */
+
+import { promises as fs } from 'node:fs';
+import path from 'node:path';
+import { atomicWriteFile } from './file-lock.js';
+
+/**
+ * Get the file path for the knowledge graph JSONL file.
+ * (MCP-compatible format, same as official Memory Server)
+ */
+export function getGraphFilePath(projectDir: string): string {
+  return path.join(projectDir, 'graph.jsonl');
+}
+
+/**
+ * Save the knowledge graph in JSONL format (MCP-compatible).
+ * Each line is a JSON object with type: "entity" or "relation".
+ *
+ * Format adopted from MCP Official Memory Server.
+ */
+export async function saveGraphJsonl(
+  projectDir: string,
+  entities: Array<{ name: string; entityType: string; observations: string[] }>,
+  relations: Array<{ from: string; to: string; relationType: string }>,
+): Promise<void> {
+  const lines = [
+    ...entities.map((e) =>
+      JSON.stringify({ type: 'entity', name: e.name, entityType: e.entityType, observations: e.observations }),
+    ),
+    ...relations.map((r) =>
+      JSON.stringify({ type: 'relation', from: r.from, to: r.to, relationType: r.relationType }),
+    ),
+  ];
+  await atomicWriteFile(getGraphFilePath(projectDir), lines.join('\n'));
+}
+
+/**
+ * Load the knowledge graph from JSONL format.
+ */
+export async function loadGraphJsonl(
+  projectDir: string,
+): Promise<{
+  entities: Array<{ name: string; entityType: string; observations: string[] }>;
+  relations: Array<{ from: string; to: string; relationType: string }>;
+}> {
+  const filePath = getGraphFilePath(projectDir);
+  try {
+    const data = await fs.readFile(filePath, 'utf-8');
+    const lines = data.split('\n').filter((line) => line.trim() !== '');
+    return lines.reduce(
+      (graph, line) => {
+        const item = JSON.parse(line);
+        if (item.type === 'entity') {
+          graph.entities.push({
+            name: item.name,
+            entityType: item.entityType,
+            observations: item.observations,
+          });
+        }
+        if (item.type === 'relation') {
+          graph.relations.push({
+            from: item.from,
+            to: item.to,
+            relationType: item.relationType,
+          });
+        }
+        return graph;
+      },
+      {
+        entities: [] as Array<{ name: string; entityType: string; observations: string[] }>,
+        relations: [] as Array<{ from: string; to: string; relationType: string }>
+      },
+    );
+  } catch (error) {
+    if (error instanceof Error && 'code' in error && (error as NodeJS.ErrnoException).code === 'ENOENT') {
+      return { entities: [], relations: [] };
+    }
+    throw error;
+  }
+}
+
+/**
+ * Save observation data as JSON (for Orama restore / export).
+ */
+export async function saveObservationsJson(
+  projectDir: string,
+  observations: unknown[],
+): Promise<void> {
+  const filePath = path.join(projectDir, 'observations.json');
+  await atomicWriteFile(filePath, JSON.stringify(observations, null, 2));
+}
+
+/**
+ * Load observation data from JSON.
+ */
+export async function loadObservationsJson(projectDir: string): Promise<unknown[]> {
+  const filePath = path.join(projectDir, 'observations.json');
+  try {
+    const data = await fs.readFile(filePath, 'utf-8');
+    return JSON.parse(data);
+  } catch (error) {
+    if (error instanceof Error && 'code' in error && (error as NodeJS.ErrnoException).code === 'ENOENT') {
+      return [];
+    }
+    throw error;
+  }
+}
+
+/**
+ * Save the next observation ID counter (legacy JSON format).
+ */
+export async function saveIdCounter(projectDir: string, nextId: number): Promise<void> {
+  const filePath = path.join(projectDir, 'counter.json');
+  await atomicWriteFile(filePath, JSON.stringify({ nextId }));
+}
+
+/**
+ * Load the next observation ID counter (legacy JSON format).
+ * For runtime use, prefer the SQLite meta table via SqliteBackend.
+ */
+export async function loadIdCounter(projectDir: string): Promise<number> {
+  const filePath = path.join(projectDir, 'counter.json');
+  try {
+    const data = await fs.readFile(filePath, 'utf-8');
+    return JSON.parse(data).nextId ?? 1;
+  } catch {
+    return 1;
+  }
+}
+
+/**
+ * Save mini-skills data as JSON (migration source only).
+ */
+export async function saveMiniSkillsJson(
+  projectDir: string,
+  skills: unknown[],
+): Promise<void> {
+  const filePath = path.join(projectDir, 'mini-skills.json');
+  await atomicWriteFile(filePath, JSON.stringify(skills, null, 2));
+}
+
+/**
+ * Load mini-skills data from JSON (migration source only).
+ */
+export async function loadMiniSkillsJson(projectDir: string): Promise<unknown[]> {
+  const filePath = path.join(projectDir, 'mini-skills.json');
+  try {
+    const data = await fs.readFile(filePath, 'utf-8');
+    const parsed = JSON.parse(data);
+    return Array.isArray(parsed) ? parsed : [];
+  } catch (error) {
+    if (error instanceof Error && 'code' in error && (error as NodeJS.ErrnoException).code === 'ENOENT') {
+      return [];
+    }
+    throw error;
+  }
+}
+
+/**
+ * Load the mini-skills ID counter (legacy JSON format).
+ */
+export async function loadMiniSkillsCounter(projectDir: string): Promise<number> {
+  const filePath = path.join(projectDir, 'mini-skills-counter.json');
+  try {
+    const data = await fs.readFile(filePath, 'utf-8');
+    return JSON.parse(data).nextId ?? 1;
+  } catch {
+    return 1;
+  }
+}
+
+/**
+ * Save the mini-skills ID counter (legacy JSON format).
+ */
+export async function saveMiniSkillsCounter(projectDir: string, nextId: number): Promise<void> {
+  const filePath = path.join(projectDir, 'mini-skills-counter.json');
+  await atomicWriteFile(filePath, JSON.stringify({ nextId }));
+}
+
+/**
+ * Save sessions data as JSON (migration source only).
+ */
+export async function saveSessionsJson(
+  projectDir: string,
+  sessions: unknown[],
+): Promise<void> {
+  const filePath = path.join(projectDir, 'sessions.json');
+  await atomicWriteFile(filePath, JSON.stringify(sessions, null, 2));
+}
+
+/**
+ * Load sessions data from JSON (migration source only).
+ */
+export async function loadSessionsJson(projectDir: string): Promise<unknown[]> {
+  const filePath = path.join(projectDir, 'sessions.json');
+  try {
+    const data = await fs.readFile(filePath, 'utf-8');
+    return JSON.parse(data);
+  } catch (error) {
+    if (error instanceof Error && 'code' in error && (error as NodeJS.ErrnoException).code === 'ENOENT') {
+      return [];
+    }
+    throw error;
+  }
+}