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

Merge 1518fc7a436ff8fcb6a4a21e8e6fbe33e86d0549 into 598f1826d8b2bc969aace2c6459824737667218c

Browse Source
This commit is contained in:
Brian Newman 2026-03-20 20:28:51 -07:00 committed by GitHub
commit d88dd68583
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 29 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -749,12 +749,12 @@ export class QmdMemoryManager implements MemorySearchManager {
): Promise<QmdQueryResult[]> => {
try {
if (mcporterEnabled) {
const tool: "search" | "vector_search" | "deep_search" =
const tool: "search" | "vector_search" | "query" =
qmdSearchCommand === "search"
? "search"
: qmdSearchCommand === "vsearch"
? "vector_search"
: "deep_search";
: "query";
const minScore = opts?.minScore ?? 0;
if (collectionNames.length > 1) {
return await this.runMcporterAcrossCollections({
@ -1234,6 +1234,31 @@ export class QmdMemoryManager implements MemorySearchManager {
log.warn(`mcporter daemon start failed: ${String(err)}`);
// Allow future searches to retry daemon start on transient failures.
delete g.__openclawMcporterDaemonStart;
return;
}
// Validate that the QMD MCP server exposes the expected tools.
try {
const expectedTools = ["search", "vector_search", "query"];
const listResult = await this.runMcporter(["list", mcporter.serverName], {
timeoutMs: 10_000,
});
const actualTools = listResult.stdout
.split("\n")
.map((l) => l.trim())
.filter(Boolean);
const missing = expectedTools.filter((t) => !actualTools.includes(t));
if (missing.length > 0) {
log.warn(
`mcporter bridge tool mismatch for server "${mcporter.serverName}": ` +
`expected tools [${expectedTools.join(", ")}], ` +
`actual tools [${actualTools.join(", ")}], ` +
`missing [${missing.join(", ")}]`,
);
}
} catch {
// Non-fatal: capability validation is best-effort.
log.warn("mcporter tool capability validation failed; continuing anyway");
}
})();
}
@ -1263,7 +1288,7 @@ export class QmdMemoryManager implements MemorySearchManager {
private async runQmdSearchViaMcporter(params: {
mcporter: ResolvedQmdMcporterConfig;
tool: "search" | "vector_search" | "deep_search";
tool: "search" | "vector_search" | "query";
query: string;
limit: number;
minScore: number;
@ -1997,7 +2022,7 @@ export class QmdMemoryManager implements MemorySearchManager {
}
private async runMcporterAcrossCollections(params: {
tool: "search" | "vector_search" | "deep_search";
tool: "search" | "vector_search" | "query";
query: string;
limit: number;
minScore: number;