github/openclaw
1
1
Fork 0
mirror of https://github.com/openclaw/openclaw.git synced 2026-04-03 03:03:24 -04:00
Code Issues Packages Projects Releases Wiki Activity

Memory/QMD: harden no-results parsing

Browse Source
This commit is contained in:
Vignesh Natarajan
2026-02-11 15:12:33 -08:00
committed by Vignesh
parent 3d343932cf
commit 2f1f82674a
3 changed files with 49 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/memory/qmd-manager.test.ts
View File

@@ -733,7 +733,6 @@ describe("QmdMemoryManager", () => {
await manager.close();
});
it("treats plain-text no-results stdout as an empty result set", async () => {
spawnMock.mockImplementation((_cmd: string, args: string[]) => {
if (args[0] === "query") {
@@ -838,7 +837,6 @@ describe("QmdMemoryManager", () => {
).rejects.toThrow(/qmd query returned invalid JSON/);
await manager.close();
});
describe("model cache symlink", () => {
let defaultModelsDir: string;
let customModelsDir: string;
@@ -921,7 +919,6 @@ describe("QmdMemoryManager", () => {
await manager!.close();
});
});
});
});
async function waitForCondition(check: () => boolean, timeoutMs: number): Promise<void> {

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

@@ -24,20 +24,13 @@ import { requireNodeSqlite } from "./sqlite.js";
type SqliteDatabase = import("node:sqlite").DatabaseSync;
import type { ResolvedMemoryBackendConfig, ResolvedQmdConfig } from "./backend-config.js";
import { parseQmdQueryJson } from "./qmd-query-parser.js";
const log = createSubsystemLogger("memory");
const SNIPPET_HEADER_RE = /@@\s*-([0-9]+),([0-9]+)/;
const SEARCH_PENDING_UPDATE_WAIT_MS = 500;
type QmdQueryResult = {
docid?: string;
score?: number;
file?: string;
snippet?: string;
body?: string;
};
type CollectionRoot = {
path: string;
kind: MemorySource;
@@ -278,7 +271,7 @@ export class QmdMemoryManager implements MemorySearchManager {
log.warn(`qmd query failed: ${String(err)}`);
throw err instanceof Error ? err : new Error(String(err));
}
const parsed = this.parseQmdQueryJson(stdout, stderr);
const parsed = parseQmdQueryJson(stdout, stderr);
const results: MemorySearchResult[] = [];
for (const entry of parsed) {
const doc = await this.resolveDocLocation(entry.docid);
@@ -976,42 +969,6 @@ export class QmdMemoryManager implements MemorySearchManager {
]);
}
private parseQmdQueryJson(stdout: string, stderr: string): QmdQueryResult[] {
const trimmedStdout = stdout.trim();
const trimmedStderr = stderr.trim();
const stdoutIsMarker = Boolean(trimmedStdout) && this.isQmdNoResultsOutput(trimmedStdout);
const stderrIsMarker = Boolean(trimmedStderr) && this.isQmdNoResultsOutput(trimmedStderr);
if (stdoutIsMarker || (!trimmedStdout && stderrIsMarker)) {
return [];
}
if (!trimmedStdout) {
const context = trimmedStderr ? ` (stderr: ${this.summarizeQmdStderr(trimmedStderr)})` : "";
const message = `stdout empty${context}`;
log.warn(`qmd query returned invalid JSON: ${message}`);
throw new Error(`qmd query returned invalid JSON: ${message}`);
}
try {
const parsed = JSON.parse(trimmedStdout) as unknown;
if (!Array.isArray(parsed)) {
throw new Error("qmd query JSON response was not an array");
}
return parsed as QmdQueryResult[];
} catch (err) {
const message = err instanceof Error ? err.message : String(err);
log.warn(`qmd query returned invalid JSON: ${message}`);
throw new Error(`qmd query returned invalid JSON: ${message}`, { cause: err });
}
}
private isQmdNoResultsOutput(raw: string): boolean {
const normalized = raw.trim().toLowerCase().replace(/\s+/g, " ");
return normalized === "no results found" || normalized === "no results found.";
}
private summarizeQmdStderr(raw: string): string {
return raw.length <= 120 ? raw : `${raw.slice(0, 117)}...`;
}
private buildCollectionFilterArgs(): string[] {
const names = this.qmd.collections.map((collection) => collection.name).filter(Boolean);
if (names.length === 0) {

47
src/memory/qmd-query-parser.ts Normal file
View File

@@ -0,0 +1,47 @@
import { createSubsystemLogger } from "../logging/subsystem.js";
const log = createSubsystemLogger("memory");
export type QmdQueryResult = {
docid?: string;
score?: number;
file?: string;
snippet?: string;
body?: string;
};
export function parseQmdQueryJson(stdout: string, stderr: string): QmdQueryResult[] {
const trimmedStdout = stdout.trim();
const trimmedStderr = stderr.trim();
const stdoutIsMarker = trimmedStdout.length > 0 && isQmdNoResultsOutput(trimmedStdout);
const stderrIsMarker = trimmedStderr.length > 0 && isQmdNoResultsOutput(trimmedStderr);
if (stdoutIsMarker || (!trimmedStdout && stderrIsMarker)) {
return [];
}
if (!trimmedStdout) {
const context = trimmedStderr ? ` (stderr: ${summarizeQmdStderr(trimmedStderr)})` : "";
const message = `stdout empty${context}`;
log.warn(`qmd query returned invalid JSON: ${message}`);
throw new Error(`qmd query returned invalid JSON: ${message}`);
}
try {
const parsed = JSON.parse(trimmedStdout) as unknown;
if (!Array.isArray(parsed)) {
throw new Error("qmd query JSON response was not an array");
}
return parsed as QmdQueryResult[];
} catch (err) {
const message = err instanceof Error ? err.message : String(err);
log.warn(`qmd query returned invalid JSON: ${message}`);
throw new Error(`qmd query returned invalid JSON: ${message}`, { cause: err });
}
}
function isQmdNoResultsOutput(raw: string): boolean {
const normalized = raw.trim().toLowerCase().replace(/\s+/g, " ");
return normalized === "no results found" || normalized === "no results found.";
}
function summarizeQmdStderr(raw: string): string {
return raw.length <= 120 ? raw : `${raw.slice(0, 117)}...`;
}