vultr/openclaw
1
0
Fork 0
mirror of https://github.com/openclaw/openclaw.git synced 2026-04-17 12:11:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

refactor: dedupe memory read fallback helper

Browse Source
This commit is contained in:
Peter Steinberger
2026-04-06 19:16:06 +01:00
parent 5116ce2d5e
commit b589de7a4f
1 changed files with 40 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

68
extensions/memory-core/src/tools.ts
View File

@@ -94,6 +94,30 @@ async function getSupplementMemoryReadResult(params: {
};
}
async function resolveMemoryReadFailureResult(params: {
error: unknown;
requestedCorpus?: "memory" | "wiki" | "all";
relPath: string;
from?: number;
lines?: number;
agentSessionKey?: string;
}) {
if (params.requestedCorpus === "all") {
const supplement = await getSupplementMemoryReadResult({
relPath: params.relPath,
from: params.from,
lines: params.lines,
agentSessionKey: params.agentSessionKey,
corpus: params.requestedCorpus,
});
if (supplement) {
return jsonResult(supplement);
}
}
const message = params.error instanceof Error ? params.error.message : String(params.error);
return jsonResult({ path: params.relPath, text: "", disabled: true, error: message });
}
export function createMemorySearchTool(options: {
config?: OpenClawConfig;
agentSessionKey?: string;
@@ -252,20 +276,14 @@ export function createMemoryGetTool(options: {
});
return jsonResult(result);
} catch (err) {
if (requestedCorpus === "all") {
const supplement = await getSupplementMemoryReadResult({
relPath,
from: from ?? undefined,
lines: lines ?? undefined,
agentSessionKey: options.agentSessionKey,
corpus: requestedCorpus,
});
if (supplement) {
return jsonResult(supplement);
}
}
const message = err instanceof Error ? err.message : String(err);
return jsonResult({ path: relPath, text: "", disabled: true, error: message });
return await resolveMemoryReadFailureResult({
error: err,
requestedCorpus,
relPath,
from: from ?? undefined,
lines: lines ?? undefined,
agentSessionKey: options.agentSessionKey,
});
}
}
const memory = await getMemoryManagerContextWithPurpose({
@@ -284,20 +302,14 @@ export function createMemoryGetTool(options: {
});
return jsonResult(result);
} catch (err) {
if (requestedCorpus === "all") {
const supplement = await getSupplementMemoryReadResult({
relPath,
from: from ?? undefined,
lines: lines ?? undefined,
agentSessionKey: options.agentSessionKey,
corpus: requestedCorpus,
});
if (supplement) {
return jsonResult(supplement);
}
}
const message = err instanceof Error ? err.message : String(err);
return jsonResult({ path: relPath, text: "", disabled: true, error: message });
return await resolveMemoryReadFailureResult({
error: err,
requestedCorpus,
relPath,
from: from ?? undefined,
lines: lines ?? undefined,
agentSessionKey: options.agentSessionKey,
});
}
},
});