LLM/moltbot
1
0
Fork 0
mirror of https://github.com/moltbot/moltbot.git synced 2026-04-27 16:33:39 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix(memory): support qmd glob collection flags (#57351)

Browse Source
This commit is contained in:
Vincent Koc
2026-03-29 17:30:49 -07:00
committed by GitHub
parent 8bf86b4cdf
commit 5bac1aad04
3 changed files with 79 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

71
extensions/memory-core/src/memory/qmd-manager.test.ts
View File

@@ -622,12 +622,12 @@ describe("QmdMemoryManager", () => {
string,
{
path: string;
mask: string;
pattern: string;
}
>([
["memory-root", { path: workspaceDir, mask: "MEMORY.md" }],
["memory-alt", { path: workspaceDir, mask: "memory.md" }],
["memory-dir", { path: path.join(workspaceDir, "memory"), mask: "**/*.md" }],
["memory-root", { path: workspaceDir, pattern: "MEMORY.md" }],
["memory-alt", { path: workspaceDir, pattern: "memory.md" }],
["memory-dir", { path: path.join(workspaceDir, "memory"), pattern: "**/*.md" }],
]);
const removeCalls: string[] = [];
@@ -641,7 +641,7 @@ describe("QmdMemoryManager", () => {
[...legacyCollections.entries()].map(([name, info]) => ({
name,
path: info.path,
mask: info.mask,
mask: info.pattern,
})),
),
);
@@ -659,16 +659,16 @@ describe("QmdMemoryManager", () => {
const child = createMockChild({ autoClose: false });
const pathArg = args[2] ?? "";
const name = args[args.indexOf("--name") + 1] ?? "";
const mask = args[args.indexOf("--mask") + 1] ?? "";
const pattern = args[args.indexOf("--glob") + 1] ?? args[args.indexOf("--mask") + 1] ?? "";
const hasConflict = [...legacyCollections.entries()].some(
([existingName, info]) =>
existingName !== name && info.path === pathArg && info.mask === mask,
existingName !== name && info.path === pathArg && info.pattern === pattern,
);
if (hasConflict) {
emitAndClose(child, "stderr", "collection already exists", 1);
return child;
}
legacyCollections.set(name, { path: pathArg, mask });
legacyCollections.set(name, { path: pathArg, pattern });
queueMicrotask(() => child.closeWith(0));
return child;
}
@@ -704,9 +704,9 @@ describe("QmdMemoryManager", () => {
string,
{
path: string;
mask: string;
pattern: string;
}
>([["memory-root-sonnet", { path: workspaceDir, mask: "MEMORY.md" }]]);
>([["memory-root-sonnet", { path: workspaceDir, pattern: "MEMORY.md" }]]);
const removeCalls: string[] = [];
spawnMock.mockImplementation((_cmd: string, args: string[]) => {
@@ -719,7 +719,7 @@ describe("QmdMemoryManager", () => {
[...listedCollections.entries()].map(([name, info]) => ({
name,
path: info.path,
mask: info.mask,
mask: info.pattern,
})),
),
);
@@ -737,16 +737,16 @@ describe("QmdMemoryManager", () => {
const child = createMockChild({ autoClose: false });
const pathArg = args[2] ?? "";
const name = args[args.indexOf("--name") + 1] ?? "";
const mask = args[args.indexOf("--mask") + 1] ?? "";
const pattern = args[args.indexOf("--glob") + 1] ?? args[args.indexOf("--mask") + 1] ?? "";
const hasConflict = [...listedCollections.entries()].some(
([existingName, info]) =>
existingName !== name && info.path === pathArg && info.mask === mask,
existingName !== name && info.path === pathArg && info.pattern === pattern,
);
if (hasConflict) {
emitAndClose(child, "stderr", "A collection already exists for this path and pattern", 1);
return child;
}
listedCollections.set(name, { path: pathArg, mask });
listedCollections.set(name, { path: pathArg, pattern });
queueMicrotask(() => child.closeWith(0));
return child;
}
@@ -797,6 +797,49 @@ describe("QmdMemoryManager", () => {
);
});
it("falls back to --mask when qmd collection add rejects --glob", async () => {
cfg = {
...cfg,
memory: {
backend: "qmd",
qmd: {
includeDefaultMemory: true,
update: { interval: "0s", debounceMs: 60_000, onBoot: false },
paths: [],
},
},
} as OpenClawConfig;
const addFlagCalls: string[] = [];
spawnMock.mockImplementation((_cmd: string, args: string[]) => {
if (args[0] === "collection" && args[1] === "list") {
const child = createMockChild({ autoClose: false });
emitAndClose(child, "stdout", "[]");
return child;
}
if (args[0] === "collection" && args[1] === "add") {
const child = createMockChild({ autoClose: false });
const flag = args.includes("--glob") ? "--glob" : args.includes("--mask") ? "--mask" : "";
addFlagCalls.push(flag);
if (flag === "--glob") {
emitAndClose(child, "stderr", "unknown flag: --glob", 1);
return child;
}
queueMicrotask(() => child.closeWith(0));
return child;
}
return createMockChild();
});
const { manager } = await createManager({ mode: "full" });
await manager.close();
expect(addFlagCalls).toEqual(["--glob", "--mask", "--mask", "--mask"]);
expect(logWarnMock).toHaveBeenCalledWith(
expect.stringContaining("retrying with legacy compatibility flag"),
);
});
it("migrates unscoped legacy collections from plain-text collection list output", async () => {
cfg = {
...cfg,

24
extensions/memory-core/src/memory/qmd-manager.ts
View File

@@ -157,6 +157,7 @@ type ManagedCollection = {
};
type QmdManagerMode = "full" | "status";
type QmdCollectionPatternFlag = "--glob" | "--mask";
export class QmdMemoryManager implements MemorySearchManager {
static async create(params: {
@@ -220,6 +221,7 @@ export class QmdMemoryManager implements MemorySearchManager {
private attemptedNullByteCollectionRepair = false;
private attemptedDuplicateDocumentRepair = false;
private readonly sessionWarm = new Set<string>();
private collectionPatternFlag: QmdCollectionPatternFlag | null = null;
private constructor(params: {
cfg: OpenClawConfig;
@@ -575,9 +577,25 @@ export class QmdMemoryManager implements MemorySearchManager {
}
private async addCollection(pathArg: string, name: string, pattern: string): Promise<void> {
await this.runQmd(["collection", "add", pathArg, "--name", name, "--mask", pattern], {
timeoutMs: this.qmd.update.commandTimeoutMs,
});
const candidateFlags: QmdCollectionPatternFlag[] =
this.collectionPatternFlag === "--mask" ? ["--mask", "--glob"] : ["--glob", "--mask"];
let lastError: unknown;
for (const flag of candidateFlags) {
try {
await this.runQmd(["collection", "add", pathArg, "--name", name, flag, pattern], {
timeoutMs: this.qmd.update.commandTimeoutMs,
});
this.collectionPatternFlag = flag;
return;
} catch (err) {
lastError = err;
if (!this.isUnsupportedQmdOptionError(err) || candidateFlags.at(-1) === flag) {
throw err;
}
log.warn(`qmd collection add rejected ${flag}; retrying with legacy compatibility flag`);
}
}
throw lastError instanceof Error ? lastError : new Error(String(lastError));
}
private async removeCollection(name: string): Promise<void> {