Skip to content
11 changes: 5 additions & 6 deletions src/functions/auto-forget.ts
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ import { markCaptureEventDeleted } from "../capture/event-record.js";
import type { Memory, CompressedObservation, Session } from "../types.js";
import { KV } from "../state/schema.js";
import { StateKV, collectAll } from "../state/kv.js";
import { supersededAt } from "../state/memory-utils.js";
import { deleteMemoryUnderLock, supersededAt } from "../state/memory-utils.js";
import { withKeyedLock } from "../state/keyed-mutex.js";
import { unindexObservationSession } from "../state/obs-index.js";
import { recordAudit } from "./audit.js";
Expand Down Expand Up @@ -31,7 +31,7 @@ export function registerAutoForgetFunction(sdk: IIIClient, kv: StateKV): void {
async (data: { dryRun?: boolean }): Promise<AutoForgetResult> => {
const dryRun = data?.dryRun ?? false;
const now = Date.now();
const { decrementImageRef } = await import("./image-refs.js");
const { decrementImageRef, releaseImageRef } = await import("./image-refs.js");

const result: AutoForgetResult = {
ttlExpired: [],
Expand All @@ -51,10 +51,9 @@ export function registerAutoForgetFunction(sdk: IIIClient, kv: StateKV): void {
result.ttlExpired.push(mem.id);
deletedIds.add(mem.id);
if (!dryRun) {
if (mem.imageRef) {
await decrementImageRef(kv, sdk, mem.imageRef);
}
await kv.delete(KV.memories, mem.id);
const removed = await deleteMemoryUnderLock(kv, KV.memories, mem.id);
if (!removed) continue;
if (removed.imageRef) await releaseImageRef(kv, sdk, mem.id, removed.imageRef);
facetIds.add(mem.id);
await recordAudit(kv, "delete", "mem::auto-forget", [mem.id], {
resource: "memory",
Expand Down
27 changes: 14 additions & 13 deletions src/functions/evict.ts
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ import type {
import { KV } from "../state/schema.js";
import { StateKV, collectAll } from "../state/kv.js";
import { withKeyedLock } from "../state/keyed-mutex.js";
import { deleteMemoryUnderLock } from "../state/memory-utils.js";
import { removeSessionFromProjectIndex } from "../state/session-index.js";
import { unindexObservationSession } from "../state/obs-index.js";
import { isConsolidationEnabled } from "../config.js";
Expand Down Expand Up @@ -115,7 +116,7 @@ export function registerEvictFunction(sdk: IIIClient, kv: StateKV): void {
sdk.registerFunction("mem::evict",
async (data: { dryRun?: boolean }): Promise<EvictionStats> => {
const dryRun = data?.dryRun ?? false;
const { decrementImageRef } = await import("./image-refs.js");
const { releaseImageRef } = await import("./image-refs.js");
let indexCleaned = false;
const removeObservation = (
sessionId: string,
Expand Down Expand Up @@ -271,8 +272,8 @@ export function registerEvictFunction(sdk: IIIClient, kv: StateKV): void {
continue;
}
await unindexObservationSession(kv, o.id).catch(() => {});
if (removed.imageData) await decrementImageRef(kv, sdk, removed.imageData);
if (removed.imageRef && removed.imageRef !== removed.imageData) await decrementImageRef(kv, sdk, removed.imageRef);
if (removed.imageData) await releaseImageRef(kv, sdk, o.id, removed.imageData);
if (removed.imageRef && removed.imageRef !== removed.imageData) await releaseImageRef(kv, sdk, o.id, removed.imageRef);
await recordAudit(kv, "delete", "mem::evict", [o.id], {
resource: "observation",
reason: "low_importance_old_observation",
Expand Down Expand Up @@ -319,8 +320,8 @@ export function registerEvictFunction(sdk: IIIClient, kv: StateKV): void {
continue;
}
await unindexObservationSession(kv, o.id).catch(() => {});
if (removed.imageData) await decrementImageRef(kv, sdk, removed.imageData);
if (removed.imageRef && removed.imageRef !== removed.imageData) await decrementImageRef(kv, sdk, removed.imageRef);
if (removed.imageData) await releaseImageRef(kv, sdk, o.id, removed.imageData);
if (removed.imageRef && removed.imageRef !== removed.imageData) await releaseImageRef(kv, sdk, o.id, removed.imageRef);
await recordAudit(kv, "delete", "mem::evict", [o.id], {
resource: "observation",
reason: "project_observation_cap",
Expand All @@ -344,8 +345,10 @@ export function registerEvictFunction(sdk: IIIClient, kv: StateKV): void {
stats.expiredMemories++;
evictedMemIds.add(mem.id);
} else {
let deleted: Memory | null;
try {
await kv.delete(KV.memories, mem.id);
deleted = await deleteMemoryUnderLock<Memory>(kv, KV.memories, mem.id);
if (!deleted) continue;
deletedMemIds.add(mem.id);
stats.expiredMemories++;
evictedMemIds.add(mem.id);
Expand All @@ -361,9 +364,7 @@ export function registerEvictFunction(sdk: IIIClient, kv: StateKV): void {
getSearchIndex().remove(mem.id);
vectorIndexRemove(mem.id);
indexCleaned = true;
if (mem.imageRef) {
await decrementImageRef(kv, sdk, mem.imageRef);
}
if (deleted.imageRef) await releaseImageRef(kv, sdk, mem.id, deleted.imageRef);
await recordAudit(kv, "delete", "mem::evict", [mem.id], {
resource: "memory",
reason: "expired_memory",
Expand All @@ -384,8 +385,10 @@ export function registerEvictFunction(sdk: IIIClient, kv: StateKV): void {
if (dryRun) {
stats.nonLatestMemories++;
} else {
let deleted: Memory | null;
try {
await kv.delete(KV.memories, mem.id);
deleted = await deleteMemoryUnderLock<Memory>(kv, KV.memories, mem.id);
if (!deleted) continue;
deletedMemIds.add(mem.id);
stats.nonLatestMemories++;
} catch (err) {
Expand All @@ -400,9 +403,7 @@ export function registerEvictFunction(sdk: IIIClient, kv: StateKV): void {
getSearchIndex().remove(mem.id);
vectorIndexRemove(mem.id);
indexCleaned = true;
if (mem.imageRef) {
await decrementImageRef(kv, sdk, mem.imageRef);
}
if (deleted.imageRef) await releaseImageRef(kv, sdk, mem.id, deleted.imageRef);
await recordAudit(kv, "delete", "mem::evict", [mem.id], {
resource: "memory",
reason: "old_non_latest_memory",
Expand Down
5 changes: 2 additions & 3 deletions src/functions/governance.ts
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ import type { Memory, GovernanceFilter, AuditEntry } from "../types.js";
import { KV } from "../state/schema.js";
import type { StateKV } from "../state/kv.js";
import { collectAll } from "../state/kv.js";
import { deleteMemoryUnderLock } from "../state/memory-utils.js";
import { recordAudit, safeAudit, queryAudit } from "./audit.js";
import { deleteAccessLog } from "./access-tracker.js";
import { deleteFacetsForTargets } from "./facets.js";
Expand All @@ -21,9 +22,7 @@ async function deleteMemoryRecord(
kv: StateKV,
id: string,
): Promise<"deleted" | "missing"> {
const mem = await kv.get<Memory>(KV.memories, id);
if (!mem) return "missing";
await kv.delete(KV.memories, id);
if (!(await deleteMemoryUnderLock(kv, KV.memories, id))) return "missing";
await deleteAccessLog(kv, id);
getSearchIndex().remove(id);
vectorIndexRemove(id);
Expand Down
13 changes: 13 additions & 0 deletions src/functions/image-refs.ts
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ import { KV } from "../state/schema.js";
import { StateKV } from "../state/kv.js";
import { deleteImage, touchImage } from "../utils/image-store.js";
import { withKeyedLock } from "../state/keyed-mutex.js";
import { logger } from "../logger.js";

export async function getImageRefCount(kv: StateKV, filePath: string): Promise<number> {
const count = await kv.get<number>(KV.imageRefs, filePath);
Expand Down Expand Up @@ -36,3 +37,15 @@ export async function decrementImageRef(kv: StateKV, sdk: IIIClient, filePath: s
}
});
}

export async function releaseImageRef(kv: StateKV, sdk: IIIClient, ownerId: string, filePath: string): Promise<void> {
try {
await decrementImageRef(kv, sdk, filePath);
} catch (err) {
logger.warn("Image reference release failed after delete", {
ownerId,
imageRef: filePath,
error: err instanceof Error ? err.message : String(err),
});
}
}
24 changes: 20 additions & 4 deletions src/functions/retention.ts
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ import type {
import { KV } from "../state/schema.js";
import type { StateKV } from "../state/kv.js";
import { collectAll } from "../state/kv.js";
import { deleteMemoryUnderLock } from "../state/memory-utils.js";
import type { AccessLog } from "./access-tracker.js";
import {
emptyAccessLog,
Expand Down Expand Up @@ -306,7 +307,7 @@ export function registerRetentionFunctions(
? data.maxEvict
: 50;
const maxEvict = Math.min(1000, Math.max(0, maxEvictRaw));
const { decrementImageRef } = await import("./image-refs.js");
const { releaseImageRef } = await import("./image-refs.js");

const allScores = await kv.list<RetentionScore>(KV.retentionScores);
const candidates = allScores
Expand Down Expand Up @@ -373,10 +374,12 @@ export function registerRetentionFunctions(
continue;
}

if (mem.imageRef) {
await decrementImageRef(kv, sdk, mem.imageRef);
const removed = await deleteMemoryUnderLock(kv, scope, candidate.memoryId);
if (!removed) {
missingIds.push(candidate.memoryId);
continue;
Comment thread
rohitg00 marked this conversation as resolved.
Resolved
}
await kv.delete(scope, candidate.memoryId);
if (removed.imageRef) await releaseImageRef(kv, sdk, candidate.memoryId, removed.imageRef);
evictedIds.push(candidate.memoryId);
evicted++;
if (resolvedSource === "semantic") evictedSemantic++;
Expand All @@ -390,6 +393,12 @@ export function registerRetentionFunctions(
}
}

const orphanScoreIds: string[] = [];
for (const id of missingIds) {
if (await kv.get(KV.memories, id) || await kv.get(KV.semantic, id)) continue;
await kv.delete(KV.retentionScores, id);
Comment thread
rohitg00 marked this conversation as resolved.
Resolved
orphanScoreIds.push(id);
}
await deleteFacetsForTargets(kv, [...evictedIds, ...missingIds]);

// Retention eviction is a structural delete path that removes
Expand All @@ -408,6 +417,13 @@ export function registerRetentionFunctions(
reason: "retention score below threshold",
});
}
if (orphanScoreIds.length > 0) {
await recordAudit(kv, "delete", "mem::retention-evict", orphanScoreIds, {
resource: "retention_score",
removed: orphanScoreIds.length,
reason: "retention score for a memory that no longer exists",
});
}

logger.info("Retention-based eviction complete", {
evicted,
Expand Down
4 changes: 4 additions & 0 deletions src/state/keyed-mutex.ts
Original file line number Diff line number Diff line change
Expand Up @@ -58,6 +58,10 @@ export function withKeyedLock<T>(
);
}

export function withReentrantKeyedLock<T>(key: string, fn: () => Promise<T>): Promise<T> {
return isKeyedLockHeld(key) ? fn() : withKeyedLock(key, fn);
}

export function withKeyedLocks<T>(keys: string[], fn: () => Promise<T>): Promise<T> {
const ordered = [...new Set(keys)].sort();
const acquire = (index: number): Promise<T> => index === ordered.length
Expand Down
15 changes: 15 additions & 0 deletions src/state/memory-utils.ts
Original file line number Diff line number Diff line change
@@ -1,7 +1,22 @@
import type { CompressedObservation, Lesson, Memory } from "../types.js";
import type { StateKV } from "./kv.js";
import { withReentrantKeyedLock } from "./keyed-mutex.js";

const MAX_DATE_MS = 8.64e15;

export function deleteMemoryUnderLock<T = Memory>(
kv: StateKV,
scope: string,
id: string,
): Promise<T | null> {
return withReentrantKeyedLock("mem:remember", async () => {
const current = await kv.get<T>(scope, id);
if (!current) return null;
await kv.delete(scope, id);
return current;
});
}

export function supersededAt(previous: string | undefined, now: string): string {
const prior = previous ? Date.parse(previous) : Number.NaN;
const current = Date.parse(now);
Expand Down
50 changes: 50 additions & 0 deletions test/image-ref-release.test.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,50 @@
import { describe, it, expect, vi, beforeEach } from "vitest";

const { warn } = vi.hoisted(() => ({ warn: vi.fn() }));
vi.mock("../src/logger.js", () => ({
logger: { info: vi.fn(), warn, error: vi.fn() },
}));

import { releaseImageRef } from "../src/functions/image-refs.js";
import { KV } from "../src/state/schema.js";

function kvWithFailingWrite(count: number) {
return {
get: async (scope: string) => (scope === KV.imageRefs ? count : null),
set: async () => {
throw new Error("image ref write failed");
},
delete: async () => {},
list: async () => [],
};
}

describe("releaseImageRef", () => {
beforeEach(() => warn.mockClear());

it("logs a failed image ref write and does not throw", async () => {
const sdk = { trigger: vi.fn() };
await expect(releaseImageRef(kvWithFailingWrite(2) as never, sdk as never, "mem_1", "/tmp/img-a.png")).resolves.toBeUndefined();
expect(warn).toHaveBeenCalledWith("Image reference release failed after delete", {
ownerId: "mem_1",
imageRef: "/tmp/img-a.png",
error: "image ref write failed",
});
});

it("decrements the count when the write succeeds", async () => {
const writes: Array<[string, string, unknown]> = [];
const kv = {
get: async () => 3,
set: async (scope: string, key: string, value: unknown) => {
writes.push([scope, key, value]);
return value;
},
delete: async () => {},
list: async () => [],
};
await releaseImageRef(kv as never, { trigger: vi.fn() } as never, "mem_2", "/tmp/img-b.png");
expect(writes).toEqual([[KV.imageRefs, "/tmp/img-b.png", 2]]);
expect(warn).not.toHaveBeenCalled();
});
});
Loading
Loading