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

fix: separate ENOENT handling for unlink vs writeFileWithinRoot in retraction

Browse Source 
Split the single catch block into two distinct error-handling paths:

1. Pre-existing content restore (writeFileWithinRoot): errors are NOT
   swallowed — ENOENT here means memoryDir was removed after our inline
   write, which is a real filesystem inconsistency that must surface.

2. Unlink (no pre-existing content): ENOENT is expected when the inline
   write didn't happen. Non-ENOENT errors (EACCES, EROFS) are re-thrown
   for triggerInternalHook to log. Added comment clarifying that the
   retraction guarantee is best-effort under adversarial filesystem
   conditions (per-action isolation absorbs the error).
This commit is contained in:
zeroaltitude 2026-03-08 17:54:20 -07:00
parent 25093b7024
commit c6110a3b15
No known key found for this signature in database
GPG Key ID: 77592FB1C703882E
1 changed files with 25 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
src/hooks/bundled/session-memory/handler.ts
View File

@ -420,23 +420,33 @@ const saveSessionToMemory: HookHandler = async (event) => {
// If the file existed before our write (slug collision), restore the
// original content instead of deleting — avoids erasing prior history.
if (event.context.blockSessionSave === true && writtenEntry !== null) {
try {
if (preExistingContent !== null) {
await writeFileWithinRoot({
rootDir: memoryDir,
relativePath: filename,
data: preExistingContent,
encoding: "utf-8",
});
log.debug("Session save retracted by post-hook — pre-existing file restored");
} else {
if (preExistingContent !== null) {
// Slug collision: another entry already existed at this filename
// before our inline write. Restore the original content rather
// than deleting — preserves the prior session's history.
// writeFileWithinRoot errors (e.g. ENOENT if memoryDir was
// removed after our inline write) are NOT swallowed — they
// indicate a real filesystem inconsistency that must surface.
await writeFileWithinRoot({
rootDir: memoryDir,
relativePath: filename,
data: preExistingContent,
encoding: "utf-8",
});
log.debug("Session save retracted by post-hook — pre-existing file restored");
} else {
try {
await fs.unlink(memoryFilePath);
log.debug("Session save retracted by post-hook (blockSessionSave)");
}
} catch (err) {
// File may not exist if inline write also didn't happen — that's fine.
if ((err as NodeJS.ErrnoException).code !== "ENOENT") {
throw err;
} catch (err) {
// ENOENT is expected when the inline write didn't happen
// (e.g. blockSessionSave was set before writeFileWithinRoot).
// Re-throw so triggerInternalHook logs it. Note: the error
// is caught per-action and does NOT propagate to the caller;
// the file may remain on disk if unlink fails (e.g. EACCES).
if ((err as NodeJS.ErrnoException).code !== "ENOENT") {
throw err;
}
}
}
return;