negodiy/openclaw
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

refactor: replace memory manager prototype mixing

Browse Source
This commit is contained in:
Peter Steinberger
2026-02-17 01:48:52 +01:00
parent 7649f9cba4
commit ddef3cadba
5 changed files with 61 additions and 145 deletions
Download Patch File Download Diff File Expand all files Collapse all files

89
src/memory/manager-embedding-ops.ts
View File

@@ -1,7 +1,6 @@
import fs from "node:fs/promises";
import type { DatabaseSync } from "node:sqlite";
import { type FSWatcher } from "chokidar";
import type { ResolvedMemorySearchConfig } from "../agents/memory-search.js";
import type { SessionFileEntry } from "./session-files.js";
import type { MemorySource } from "./types.js";
import { createSubsystemLogger } from "../logging/subsystem.js";
import { runGeminiEmbeddingBatches, type GeminiBatchRequest } from "./batch-gemini.js";
import {
@@ -12,12 +11,6 @@ import {
import { type VoyageBatchRequest, runVoyageEmbeddingBatches } from "./batch-voyage.js";
import { enforceEmbeddingMaxInputTokens } from "./embedding-chunk-limits.js";
import { estimateUtf8Bytes } from "./embedding-input-limits.js";
import {
type EmbeddingProvider,
type GeminiEmbeddingClient,
type OpenAiEmbeddingClient,
type VoyageEmbeddingClient,
} from "./embeddings.js";
import {
chunkMarkdown,
hashText,
@@ -26,8 +19,7 @@ import {
type MemoryChunk,
type MemoryFileEntry,
} from "./internal.js";
import type { SessionFileEntry } from "./session-files.js";
import type { MemorySource } from "./types.js";
import { MemoryManagerSyncOps } from "./manager-sync-ops.js";
const VECTOR_TABLE = "chunks_vec";
const FTS_TABLE = "chunks_fts";
@@ -48,62 +40,7 @@ const vectorToBlob = (embedding: number[]): Buffer =>
const log = createSubsystemLogger("memory");
abstract class MemoryManagerEmbeddingOps {
protected abstract readonly agentId: string;
protected abstract readonly workspaceDir: string;
protected abstract readonly settings: ResolvedMemorySearchConfig;
protected provider: EmbeddingProvider | null = null;
protected fallbackFrom?: "openai" | "local" | "gemini" | "voyage";
protected openAi?: OpenAiEmbeddingClient;
protected gemini?: GeminiEmbeddingClient;
protected voyage?: VoyageEmbeddingClient;
protected abstract batch: {
enabled: boolean;
wait: boolean;
concurrency: number;
pollIntervalMs: number;
timeoutMs: number;
};
protected readonly sources: Set<MemorySource> = new Set();
protected providerKey: string | null = null;
protected abstract readonly vector: {
enabled: boolean;
available: boolean | null;
extensionPath?: string;
loadError?: string;
dims?: number;
};
protected readonly fts: {
enabled: boolean;
available: boolean;
loadError?: string;
} = { enabled: false, available: false };
protected vectorReady: Promise<boolean> | null = null;
protected watcher: FSWatcher | null = null;
protected watchTimer: NodeJS.Timeout | null = null;
protected sessionWatchTimer: NodeJS.Timeout | null = null;
protected sessionUnsubscribe: (() => void) | null = null;
protected fallbackReason?: string;
protected intervalTimer: NodeJS.Timeout | null = null;
protected closed = false;
protected dirty = false;
protected sessionsDirty = false;
protected sessionsDirtyFiles = new Set<string>();
protected sessionPendingFiles = new Set<string>();
protected sessionDeltas = new Map<
string,
{ lastSize: number; pendingBytes: number; pendingMessages: number }
>();
protected batchFailureCount = 0;
protected batchFailureLastError?: string;
protected batchFailureLastProvider?: string;
protected batchFailureLock: Promise<void> = Promise.resolve();
protected abstract readonly cache: { enabled: boolean; maxEntries?: number };
protected abstract db: DatabaseSync;
protected abstract ensureVectorReady(dimensions?: number): Promise<boolean>;
export class MemoryManagerEmbeddingOps extends MemoryManagerSyncOps {
private buildEmbeddingBatches(chunks: MemoryChunk[]): MemoryChunk[][] {
const batches: MemoryChunk[][] = [];
let current: MemoryChunk[] = [];
@@ -204,7 +141,7 @@ abstract class MemoryManagerEmbeddingOps {
}
}
private pruneEmbeddingCacheIfNeeded(): void {
protected pruneEmbeddingCacheIfNeeded(): void {
if (!this.cache.enabled) {
return;
}
@@ -400,13 +337,13 @@ abstract class MemoryManagerEmbeddingOps {
chunks: MemoryChunk[];
source: MemorySource;
}): {
agentId: string;
agentId: string | undefined;
requests: TRequest[];
wait: boolean;
concurrency: number;
pollIntervalMs: number;
timeoutMs: number;
debug: (message: string, data?: Record<string, unknown>) => void;
debug: (message: string, data: Record<string, unknown>) => void;
} {
const { requests, chunks, source } = params;
return {
@@ -553,7 +490,7 @@ abstract class MemoryManagerEmbeddingOps {
return embeddings;
}
private async embedBatchWithRetry(texts: string[]): Promise<number[][]> {
protected async embedBatchWithRetry(texts: string[]): Promise<number[][]> {
if (texts.length === 0) {
return [];
}
@@ -606,7 +543,7 @@ abstract class MemoryManagerEmbeddingOps {
return isLocal ? EMBEDDING_BATCH_TIMEOUT_LOCAL_MS : EMBEDDING_BATCH_TIMEOUT_REMOTE_MS;
}
private async embedQueryWithTimeout(text: string): Promise<number[]> {
protected async embedQueryWithTimeout(text: string): Promise<number[]> {
if (!this.provider) {
throw new Error("Cannot embed query in FTS-only mode (no embedding provider)");
}
@@ -619,7 +556,7 @@ abstract class MemoryManagerEmbeddingOps {
);
}
private async withTimeout<T>(
protected async withTimeout<T>(
promise: Promise<T>,
timeoutMs: number,
message: string,
@@ -747,11 +684,11 @@ abstract class MemoryManagerEmbeddingOps {
}
}
private getIndexConcurrency(): number {
protected getIndexConcurrency(): number {
return this.batch.enabled ? this.batch.concurrency : EMBEDDING_INDEX_CONCURRENCY;
}
private async indexFile(
protected async indexFile(
entry: MemoryFileEntry | SessionFileEntry,
options: { source: MemorySource; content?: string },
) {
@@ -865,5 +802,3 @@ abstract class MemoryManagerEmbeddingOps {
.run(entry.path, options.source, entry.hash, entry.mtimeMs, entry.size);
}
}
export const memoryManagerEmbeddingOps = MemoryManagerEmbeddingOps.prototype;