memorix 1.4.6 → 1.5.1

package/src/search/query-expansion.ts

@@ -1,52 +1,52 @@
-import { callLLM, initLLM, isLLMEnabled } from '../llm/provider.js';
-
-const CJK_PATTERN = /[\u4e00-\u9fff\u3040-\u309f\u30a0-\u30ff\uac00-\ud7af]/g;
-const COMMAND_LIKE_QUERY = /\b(git|npm|npx|pnpm|yarn|node|bash|powershell|curl|memorix)\b/i;
-
-const QUERY_EXPANSION_PROMPT = `You rewrite coding-memory search queries for retrieval.
-
-Rules:
-- Input may be Chinese, Japanese, or Korean
-- Output one short English search phrase only
-- Keep the technical meaning
-- Prefer wording that would match engineering notes or memory titles
-- No bullets, no JSON, no explanation, no quotes
-- 4 to 12 words is ideal`;
-
-function isCjkHeavy(query: string): boolean {
-  const cjkCount = (query.match(CJK_PATTERN) || []).length;
-  return query.length > 0 && cjkCount / query.length > 0.3;
-}
-
-function normalizeExpansion(text: string): string {
-  return text
-    .trim()
-    .replace(/^[-*]\s*/, '')
-    .replace(/^["'`]+|["'`]+$/g, '')
-    .split(/\r?\n/)[0]
-    .trim();
-}
-
-export async function maybeExpandSearchQuery(query: string): Promise<string> {
-  if (!query || !isCjkHeavy(query) || COMMAND_LIKE_QUERY.test(query)) {
-    return query;
-  }
-
-  if (!isLLMEnabled()) {
-    initLLM();
-  }
-
-  if (!isLLMEnabled()) {
-    return query;
-  }
-
-  try {
-    const response = await callLLM(QUERY_EXPANSION_PROMPT, query);
-    const expanded = normalizeExpansion(response.content);
-    if (!expanded) return query;
-    if (expanded.toLowerCase() === query.toLowerCase()) return query;
-    return `${query} ${expanded}`.slice(0, 500);
-  } catch {
-    return query;
-  }
-}
+import { callLLM, initLLM, isLLMEnabled } from '../llm/provider.js';
+
+const CJK_PATTERN = /[\u4e00-\u9fff\u3040-\u309f\u30a0-\u30ff\uac00-\ud7af]/g;
+const COMMAND_LIKE_QUERY = /\b(git|npm|npx|pnpm|yarn|node|bash|powershell|curl|memorix)\b/i;
+
+const QUERY_EXPANSION_PROMPT = `You rewrite coding-memory search queries for retrieval.
+
+Rules:
+- Input may be Chinese, Japanese, or Korean
+- Output one short English search phrase only
+- Keep the technical meaning
+- Prefer wording that would match engineering notes or memory titles
+- No bullets, no JSON, no explanation, no quotes
+- 4 to 12 words is ideal`;
+
+function isCjkHeavy(query: string): boolean {
+  const cjkCount = (query.match(CJK_PATTERN) || []).length;
+  return query.length > 0 && cjkCount / query.length > 0.3;
+}
+
+function normalizeExpansion(text: string): string {
+  return text
+    .trim()
+    .replace(/^[-*]\s*/, '')
+    .replace(/^["'`]+|["'`]+$/g, '')
+    .split(/\r?\n/)[0]
+    .trim();
+}
+
+export async function maybeExpandSearchQuery(query: string): Promise<string> {
+  if (!query || !isCjkHeavy(query) || COMMAND_LIKE_QUERY.test(query)) {
+    return query;
+  }
+
+  if (!isLLMEnabled()) {
+    initLLM();
+  }
+
+  if (!isLLMEnabled()) {
+    return query;
+  }
+
+  try {
+    const response = await callLLM(QUERY_EXPANSION_PROMPT, query);
+    const expanded = normalizeExpansion(response.content);
+    if (!expanded) return query;
+    if (expanded.toLowerCase() === query.toLowerCase()) return query;
+    return `${query} ${expanded}`.slice(0, 500);
+  } catch {
+    return query;
+  }
+}

package/src/server/formation-timeout.ts

@@ -1,27 +1,27 @@
-export const DEFAULT_FORMATION_TIMEOUT_MS = 12_000;
-export const FORMATION_TIMEOUT_MIN_MS = 1_000;
-export const FORMATION_TIMEOUT_MAX_MS = 300_000;
-
-/**
- * Parse and validate MEMORIX_FORMATION_TIMEOUT_MS.
- * - Must be a valid integer in the range 1000-300000ms.
- * - Invalid values fall back to the default and log a warning.
- * - Out-of-range values are clamped to the nearest bound.
- * Default: 12000ms (12s).
- */
-export function parseFormationTimeoutMs(raw: string | undefined): number {
-  const value = raw?.trim();
-  if (!value) return DEFAULT_FORMATION_TIMEOUT_MS;
-
-  const parsed = Number(value);
-  if (!Number.isInteger(parsed) || Number.isNaN(parsed)) {
-    console.warn(
-      `[memorix] MEMORIX_FORMATION_TIMEOUT_MS="${raw}" is invalid (must be a positive integer between ${FORMATION_TIMEOUT_MIN_MS}-${FORMATION_TIMEOUT_MAX_MS}ms). Using default ${DEFAULT_FORMATION_TIMEOUT_MS}ms.`,
-    );
-    return DEFAULT_FORMATION_TIMEOUT_MS;
-  }
-
-  if (parsed < FORMATION_TIMEOUT_MIN_MS) return FORMATION_TIMEOUT_MIN_MS;
-  if (parsed > FORMATION_TIMEOUT_MAX_MS) return FORMATION_TIMEOUT_MAX_MS;
-  return parsed;
-}
+export const DEFAULT_FORMATION_TIMEOUT_MS = 12_000;
+export const FORMATION_TIMEOUT_MIN_MS = 1_000;
+export const FORMATION_TIMEOUT_MAX_MS = 300_000;
+
+/**
+ * Parse and validate MEMORIX_FORMATION_TIMEOUT_MS.
+ * - Must be a valid integer in the range 1000-300000ms.
+ * - Invalid values fall back to the default and log a warning.
+ * - Out-of-range values are clamped to the nearest bound.
+ * Default: 12000ms (12s).
+ */
+export function parseFormationTimeoutMs(raw: string | undefined): number {
+  const value = raw?.trim();
+  if (!value) return DEFAULT_FORMATION_TIMEOUT_MS;
+
+  const parsed = Number(value);
+  if (!Number.isInteger(parsed) || Number.isNaN(parsed)) {
+    console.warn(
+      `[memorix] MEMORIX_FORMATION_TIMEOUT_MS="${raw}" is invalid (must be a positive integer between ${FORMATION_TIMEOUT_MIN_MS}-${FORMATION_TIMEOUT_MAX_MS}ms). Using default ${DEFAULT_FORMATION_TIMEOUT_MS}ms.`,
+    );
+    return DEFAULT_FORMATION_TIMEOUT_MS;
+  }
+
+  if (parsed < FORMATION_TIMEOUT_MIN_MS) return FORMATION_TIMEOUT_MIN_MS;
+  if (parsed > FORMATION_TIMEOUT_MAX_MS) return FORMATION_TIMEOUT_MAX_MS;
+  return parsed;
+}

package/src/server.ts

@@ -50,7 +50,7 @@ import type { ExistingMemory } from './llm/memory-manager.js';
 import { runFormation, getMetricsSummary, getBeforeAfterMetrics } from './memory/formation/index.js';
 import type { FormationConfig, SearchHit, FormedMemory, FormationStage, FormationStageEvent } from './memory/formation/types.js';
 import { parseFormationTimeoutMs } from './server/formation-timeout.js';
-import { withTimeout } from './timeout.js';
+import { withTimeout, withTimeoutSignal } from './timeout.js';
 import { sanitizeCredentials } from './memory/secret-filter.js';
 import { getSurfacedIds, recordSurfacedIds } from './search/surfaced-registry.js';
 import {
@@ -828,8 +828,8 @@ export async function createMemorixServer(
             mode: 'active',
             useLLM: isLLMEnabled(),
             minValueScore: 0.3,
-            searchMemories: async (q: string, limit: number, pid: string): Promise<SearchHit[]> => {
-              const result = await compactSearch({ query: q, limit, projectId: pid, status: 'active', reader });
+            searchMemories: async (q: string, limit: number, pid: string, signal?: AbortSignal): Promise<SearchHit[]> => {
+              const result = await compactSearch({ query: q, limit, projectId: pid, status: 'active', reader, signal });
               if (result.entries.length === 0) return [];
               const details = await compactDetail(result.entries.map(e => e.id), { reader });
               return details.documents.map((d, i) => ({
@@ -860,8 +860,9 @@ export async function createMemorixServer(
             onStageEvent: onFormationStageEvent,
           };
 
-          formationResult = await withTimeout(
-            runFormation({
+          formationResult = await withTimeoutSignal(async (signal) => {
+            formationConfig.signal = signal;
+            return runFormation({
               entityName,
               type: type as ObservationType,
               title,
@@ -869,7 +870,8 @@ export async function createMemorixServer(
               facts: safeFacts,
               projectId: project.id,
               source: 'explicit',
-            }, formationConfig),
+            }, formationConfig);
+          },
             FORMATION_TIMEOUT_MS,
             'Formation pipeline',
           );
@@ -1265,8 +1267,8 @@ export async function createMemorixServer(
             mode: formationMode,
             useLLM: isLLMEnabled(),
             minValueScore: 0.3,
-            searchMemories: async (q: string, limit: number, pid: string): Promise<SearchHit[]> => {
-              const result = await compactSearch({ query: q, limit, projectId: pid, status: 'active', reader });
+            searchMemories: async (q: string, limit: number, pid: string, signal?: AbortSignal): Promise<SearchHit[]> => {
+              const result = await compactSearch({ query: q, limit, projectId: pid, status: 'active', reader, signal });
               if (result.entries.length === 0) return [];
               const details = await compactDetail(result.entries.map(e => e.id), { reader });
               return details.documents.map((d, i) => ({
@@ -1288,8 +1290,10 @@ export async function createMemorixServer(
             getEntityNames: () => graphManager.getEntityNames(),
           };
 
-          const formed = await withTimeout(
-            runFormation({ entityName, type: type as ObservationType, title, narrative, facts: safeFacts, projectId: project.id, source: 'explicit', topicKey }, formationConfig),
+          const formed = await withTimeoutSignal(async (signal) => {
+            formationConfig.signal = signal;
+            return runFormation({ entityName, type: type as ObservationType, title, narrative, facts: safeFacts, projectId: project.id, source: 'explicit', topicKey }, formationConfig);
+          },
             FORMATION_TIMEOUT_MS,
             'Shadow formation',
           );