github/openclaw
1
0
Fork 0
mirror of https://github.com/openclaw/openclaw.git synced 2026-05-09 22:14:34 +00:00
Code Issues Packages Projects Releases Wiki Activity

Memory/QMD: add configurable search mode

Browse Source
This commit is contained in:
Vignesh Natarajan
2026-02-07 19:48:03 -08:00
committed by Vignesh
parent c2f9f2e1cd
commit 6d9d4d04ed
9 changed files with 907 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

48
src/memory/qmd-manager.ts
View File

@@ -260,7 +260,8 @@ export class QmdMemoryManager implements MemorySearchManager {
log.warn("qmd query skipped: no managed collections configured");
return [];
}
const args = ["query", trimmed, "--json", "-n", String(limit), ...collectionFilterArgs];
const qmdSearchCommand = this.qmd.searchMode;
const args = this.buildSearchArgs(qmdSearchCommand, trimmed, limit, collectionFilterArgs);
let stdout: string;
let stderr: string;
try {
@@ -268,8 +269,25 @@ export class QmdMemoryManager implements MemorySearchManager {
stdout = result.stdout;
stderr = result.stderr;
} catch (err) {
log.warn(`qmd query failed: ${String(err)}`);
throw err instanceof Error ? err : new Error(String(err));
if (qmdSearchCommand !== "query" && this.isUnsupportedQmdOptionError(err)) {
log.warn(
`qmd ${qmdSearchCommand} does not support configured flags; retrying search with qmd query`,
);
try {
const fallback = await this.runQmd(
this.buildSearchArgs("query", trimmed, limit, collectionFilterArgs),
{ timeoutMs: this.qmd.limits.timeoutMs },
);
stdout = fallback.stdout;
stderr = fallback.stderr;
} catch (fallbackErr) {
log.warn(`qmd query fallback failed: ${String(fallbackErr)}`);
throw fallbackErr instanceof Error ? fallbackErr : new Error(String(fallbackErr));
}
} else {
log.warn(`qmd ${qmdSearchCommand} failed: ${String(err)}`);
throw err instanceof Error ? err : new Error(String(err));
}
}
const parsed = parseQmdQueryJson(stdout, stderr);
const results: MemorySearchResult[] = [];
@@ -953,6 +971,18 @@ export class QmdMemoryManager implements MemorySearchManager {
return normalized.includes("sqlite_busy") || normalized.includes("database is locked");
}
private isUnsupportedQmdOptionError(err: unknown): boolean {
const message = err instanceof Error ? err.message : String(err);
const normalized = message.toLowerCase();
return (
normalized.includes("unknown flag") ||
normalized.includes("unknown option") ||
normalized.includes("unrecognized option") ||
normalized.includes("flag provided but not defined") ||
normalized.includes("unexpected argument")
);
}
private createQmdBusyError(err: unknown): Error {
const message = err instanceof Error ? err.message : String(err);
return new Error(`qmd index busy while reading results: ${message}`);
@@ -976,4 +1006,16 @@ export class QmdMemoryManager implements MemorySearchManager {
}
return names.flatMap((name) => ["-c", name]);
}
private buildSearchArgs(
command: "query" | "search" | "vsearch",
query: string,
limit: number,
collectionFilterArgs: string[],
): string[] {
if (command === "query") {
return ["query", query, "--json", "-n", String(limit), ...collectionFilterArgs];
}
return [command, query, "--json"];
}
}