@timber-js/app 0.2.0-alpha.19 → 0.2.0-alpha.190

package/src/cache/index.ts

@@ -1,8 +1,14 @@
 // @timber-js/app/cache — Caching primitives
 
+import { estimateByteSize } from './sizeof.js';
+
 export interface CacheHandler {
   get(key: string): Promise<{ value: unknown; stale: boolean } | null>;
-  set(key: string, value: unknown, opts: { ttl: number; tags: string[] }): Promise<void>;
+  set(
+    key: string,
+    value: unknown,
+    opts: { ttl: number; tags: string[]; generation?: number }
+  ): Promise<void>;
   invalidate(opts: { key?: string; tag?: string }): Promise<void>;
 }
 
@@ -12,19 +18,43 @@ export interface CacheOptions<Fn extends (...args: any[]) => any> {
   key?: (...args: Parameters<Fn>) => string;
   staleWhileRevalidate?: boolean;
   tags?: string[] | ((...args: Parameters<Fn>) => string[]);
+  /** Timeout (ms) for singleflight-coalesced calls. Prevents hung fn() from
+   *  permanently blocking all future callers for the same cache key. See TIM-518. */
+  timeoutMs?: number;
 }
 
 export interface MemoryCacheHandlerOptions {
   /** Maximum number of entries. Oldest accessed entries are evicted first. Default: 1000. */
+  maxEntries?: number;
+  /**
+   * @deprecated Use `maxEntries` instead. Will be removed in a future release.
+   * Alias for `maxEntries` — maximum number of entries (not bytes).
+   */
   maxSize?: number;
+  /** Maximum total byte budget for all cached values. Oldest entries are evicted when exceeded. Default: no limit. */
+  maxBytes?: number;
+  /** Maximum byte size for a single cache entry. Entries exceeding this are silently dropped. Default: no limit. */
+  maxEntryBytes?: number;
 }
 
 export class MemoryCacheHandler implements CacheHandler {
-  private store = new Map<string, { value: unknown; expiresAt: number; tags: string[] }>();
-  private maxSize: number;
+  private store = new Map<
+    string,
+    { value: unknown; expiresAt: number; tags: string[]; byteSize: number }
+  >();
+  private generations = new Map<string, number>();
+  private maxEntries: number;
+  private maxBytes: number | undefined;
+  private maxEntryBytes: number | undefined;
+  private currentBytes = 0;
+  private readonly _trackBytes: boolean;
 
   constructor(opts?: MemoryCacheHandlerOptions) {
-    this.maxSize = opts?.maxSize ?? 1000;
+    // maxEntries takes precedence over deprecated maxSize
+    this.maxEntries = opts?.maxEntries ?? opts?.maxSize ?? 1000;
+    this.maxBytes = opts?.maxBytes;
+    this.maxEntryBytes = opts?.maxEntryBytes;
+    this._trackBytes = this.maxBytes !== undefined || this.maxEntryBytes !== undefined;
   }
 
   async get(key: string) {
@@ -39,37 +69,76 @@ export class MemoryCacheHandler implements CacheHandler {
     return { value: entry.value, stale };
   }
 
-  async set(key: string, value: unknown, opts: { ttl: number; tags: string[] }) {
-    // If key already exists, delete first to refresh insertion order
+  async set(
+    key: string,
+    value: unknown,
+    opts: { ttl: number; tags: string[]; generation?: number }
+  ) {
+    // CAS guard: skip write if a newer generation has already been written
+    if (opts.generation !== undefined) {
+      const current = this.generations.get(key) ?? 0;
+      if (opts.generation < current) return;
+    }
+
+    const byteSize = this._trackBytes ? estimateByteSize(value) : 0;
+
+    // Reject entries exceeding per-entry byte limit
+    if (this.maxEntryBytes !== undefined && byteSize > this.maxEntryBytes) {
+      return;
+    }
+
+    // If key already exists, delete first to refresh insertion order and reclaim bytes
     if (this.store.has(key)) {
+      const existing = this.store.get(key)!;
+      this.currentBytes -= existing.byteSize;
       this.store.delete(key);
     }
 
-    // Evict oldest entries (front of Map) if at capacity
-    while (this.store.size >= this.maxSize) {
-      const oldest = this.store.keys().next().value;
-      if (oldest !== undefined) {
-        this.store.delete(oldest);
-      } else {
-        break;
+    // Evict oldest entries (front of Map) if at entry count capacity
+    while (this.store.size >= this.maxEntries) {
+      this.evictOldest();
+    }
+
+    // Evict oldest entries if byte budget would be exceeded
+    if (this.maxBytes !== undefined) {
+      while (this.currentBytes + byteSize > this.maxBytes && this.store.size > 0) {
+        this.evictOldest();
+      }
+      // If the single entry exceeds the total byte budget, don't store it
+      if (this.currentBytes + byteSize > this.maxBytes) {
+        return;
       }
     }
 
+    // Record generation only after all admission checks pass
+    if (opts.generation !== undefined) {
+      this.generations.set(key, opts.generation);
+    }
+
     this.store.set(key, {
       value,
       expiresAt: Date.now() + opts.ttl * 1000,
       tags: opts.tags,
+      byteSize,
     });
+    this.currentBytes += byteSize;
   }
 
   async invalidate(opts: { key?: string; tag?: string }) {
     if (opts.key) {
-      this.store.delete(opts.key);
+      const entry = this.store.get(opts.key);
+      if (entry) {
+        this.currentBytes -= entry.byteSize;
+        this.store.delete(opts.key);
+      }
+      this.generations.delete(opts.key);
     }
     if (opts.tag) {
       for (const [key, entry] of this.store) {
         if (entry.tags.includes(opts.tag)) {
+          this.currentBytes -= entry.byteSize;
           this.store.delete(key);
+          this.generations.delete(key);
         }
       }
     }
@@ -79,13 +148,37 @@ export class MemoryCacheHandler implements CacheHandler {
   get size(): number {
     return this.store.size;
   }
+
+  /** Estimated total byte size of all cached values. Only tracked when maxBytes or maxEntryBytes is configured; returns 0 otherwise. */
+  get bytes(): number {
+    return this.currentBytes;
+  }
+
+  /** Evict the oldest entry (front of Map). */
+  private evictOldest(): void {
+    const oldest = this.store.keys().next().value;
+    if (oldest !== undefined) {
+      const entry = this.store.get(oldest)!;
+      this.currentBytes -= entry.byteSize;
+      this.store.delete(oldest);
+      this.generations.delete(oldest);
+    }
+  }
 }
 
 export { RedisCacheHandler } from './redis-handler';
-export type { RedisClient } from './redis-handler';
-export { createCache } from './timber-cache';
-export { registerCachedFunction } from './register-cached-function';
-export type { RegisterCachedFunctionOptions } from './register-cached-function';
-export { stableStringify } from './stable-stringify';
-export { createSingleflight } from './singleflight';
-export type { Singleflight } from './singleflight';
+export type { RedisClient, RedisWriteOp } from './redis-handler';
+export { cache } from './cache-api';
+export { setCacheHandler, getCacheHandler } from './handler-store';
+export { setDefaultSingleflightTimeout } from './timber-cache';
+// NOTE: registerCachedFunction (runtime for 'use cache' directive) removed.
+// Future feature pending design doc. See design/06-caching.md.
+export { estimateByteSize } from './sizeof';
+
+// --- Cache Store layering (design/46) ---
+export { TagAwareCacheHandler } from './tag-aware-handler';
+export type { CacheStore } from './store';
+// stableStringify, createSingleflight, and SingleflightTimeoutError are
+// internal utilities used by the cache implementation. They are not
+// re-exported here — import directly from the source files if needed
+// within the package. See TIM-720.

package/src/cache/invalidation-epoch.ts

@@ -0,0 +1,93 @@
+/**
+ * Per-process invalidation epoch tracking for timber.cache (TIM-1028).
+ *
+ * handler.set for a cache miss runs after `fn()` resolves. An explicit
+ * `cache.invalidate({ tag })` / `revalidateTag` that lands while fn is in
+ * flight would otherwise be silently undone — the just-invalidated value
+ * re-stored as fresh for the full TTL, resurrecting pre-mutation data.
+ *
+ * Every invalidation bumps a monotonic epoch and records it against the
+ * invalidated key/tag. Before storing a result, the cache wrapper checks
+ * whether its key or any of its tags were invalidated after fn started and
+ * skips the write if so. Skipping is always safe: the only cost is one
+ * extra cache miss on the next call.
+ *
+ * Scope: per-process, like the singleflight map. An invalidation issued by
+ * another instance against a shared handler (Redis/KV) during fn flight is
+ * not observable here — closing that window fully would require store-level
+ * versioning, which no CacheHandler backend offers.
+ */
+
+let epoch = 0;
+
+/**
+ * Last-invalidated epoch per `key:<k>` / `tag:<t>` entry. Insertion order is
+ * epoch order (entries are re-inserted on update), so the oldest entry is
+ * always first — pruning evicts lowest epochs.
+ */
+const lastInvalidated = new Map<string, number>();
+
+/**
+ * Bound on tracked entries so high-cardinality tag invalidation (e.g.
+ * per-user tags) cannot grow this map without limit.
+ */
+const MAX_TRACKED_ENTRIES = 10_000;
+
+/**
+ * Highest epoch evicted from the map. Any execution that started at or
+ * before this epoch conservatively counts as invalidated — history was
+ * truncated, so we can no longer prove it wasn't.
+ */
+let evictedEpochFloor = 0;
+
+/** The current epoch. Capture before running fn(), pass to wasInvalidatedSince. */
+export function currentInvalidationEpoch(): number {
+  return epoch;
+}
+
+/**
+ * Record an invalidation. Call BEFORE handler.invalidate() so an execution
+ * whose set-check races the invalidation errs toward skipping the write.
+ */
+export function recordInvalidation(opts: { key?: string; tag?: string }): void {
+  epoch++;
+  if (opts.key) track(`key:${opts.key}`);
+  if (opts.tag) track(`tag:${opts.tag}`);
+}
+
+function track(entry: string): void {
+  lastInvalidated.delete(entry);
+  lastInvalidated.set(entry, epoch);
+  while (lastInvalidated.size > MAX_TRACKED_ENTRIES) {
+    const oldest = lastInvalidated.entries().next().value;
+    if (oldest === undefined) break;
+    evictedEpochFloor = Math.max(evictedEpochFloor, oldest[1]);
+    lastInvalidated.delete(oldest[0]);
+  }
+}
+
+/**
+ * Whether the key or any tag was invalidated after `startEpoch` (the epoch
+ * captured when fn started executing).
+ */
+export function wasInvalidatedSince(startEpoch: number, key: string, tags: string[]): boolean {
+  return lastInvalidationEpochFor(key, tags) > startEpoch;
+}
+
+/**
+ * The highest epoch at which the key or any of the tags was invalidated
+ * (0 if never). Used to scope the singleflight key: callers arriving after
+ * an invalidation must not coalesce onto a flight that started before it —
+ * they would receive the pre-invalidation result the invalidation was
+ * issued to discard.
+ */
+export function lastInvalidationEpochFor(key: string, tags: string[]): number {
+  let last = evictedEpochFloor;
+  const keyEpoch = lastInvalidated.get(`key:${key}`);
+  if (keyEpoch !== undefined && keyEpoch > last) last = keyEpoch;
+  for (const tag of tags) {
+    const tagEpoch = lastInvalidated.get(`tag:${tag}`);
+    if (tagEpoch !== undefined && tagEpoch > last) last = tagEpoch;
+  }
+  return last;
+}

package/src/cache/json-lossy-check.ts

@@ -0,0 +1,75 @@
+const LOSSY_TYPES = ['Date', 'Map', 'Set', 'BigInt'] as const;
+
+let hasWarned = false;
+
+/**
+ * Dev-mode warning when a cache value contains types that lose fidelity
+ * through JSON round-trip. Only runs in development — no-op in production.
+ *
+ * Detects: Date (→ ISO string), Map/Set (→ {}), BigInt (→ throws).
+ * Emits once per process to avoid log spam.
+ */
+export function warnLossyJsonValue(value: unknown, cacheKey: string): void {
+  if (hasWarned) return;
+  if (process.env.NODE_ENV === 'production') return;
+
+  const lossy = findLossyTypes(value, new Set(), 0);
+  if (lossy.size === 0) return;
+
+  hasWarned = true;
+  const types = [...lossy].join(', ');
+  console.warn(
+    `[timber] cache value for key "${cacheKey}" contains ${types} — ` +
+      'these types lose fidelity through JSON serialization in Redis/KV cache handlers. ' +
+      'Date becomes an ISO string, Map/Set become {}, BigInt throws. ' +
+      'The MemoryCacheHandler preserves them. Consider transforming values ' +
+      'to JSON-safe types before caching, or use MemoryCacheHandler for ' +
+      'values that require type preservation.'
+  );
+}
+
+function findLossyTypes(value: unknown, seen: Set<unknown>, depth: number): Set<string> {
+  const lossy = new Set<string>();
+  if (depth > 8 || value === null || value === undefined) return lossy;
+  if (typeof value === 'bigint') {
+    lossy.add('BigInt');
+    return lossy;
+  }
+  if (typeof value !== 'object' && typeof value !== 'function') return lossy;
+  if (seen.has(value)) return lossy;
+  seen.add(value);
+
+  if (value instanceof Date) {
+    lossy.add('Date');
+    return lossy;
+  }
+  if (value instanceof Map) {
+    lossy.add('Map');
+    return lossy;
+  }
+  if (value instanceof Set) {
+    lossy.add('Set');
+    return lossy;
+  }
+
+  if (Array.isArray(value)) {
+    for (const item of value) {
+      for (const t of findLossyTypes(item, seen, depth + 1)) lossy.add(t);
+      if (lossy.size === LOSSY_TYPES.length) return lossy;
+    }
+    return lossy;
+  }
+
+  for (const k of Object.keys(value as Record<string, unknown>)) {
+    for (const t of findLossyTypes((value as Record<string, unknown>)[k], seen, depth + 1)) {
+      lossy.add(t);
+    }
+    if (lossy.size === LOSSY_TYPES.length) return lossy;
+  }
+  return lossy;
+}
+
+/** Reset warning state — for tests only. */
+export function _resetLossyWarning(): void {
+  hasWarned = false;
+}

package/src/cache/redis-handler.ts

@@ -1,16 +1,132 @@
 import type { CacheHandler } from './index';
+import { warnLossyJsonValue } from './json-lossy-check.js';
 
 /**
- * Minimal Redis client interface — compatible with ioredis, node-redis, and
- * Cloudflare Workers Redis bindings. We depend on the interface, not the
- * implementation, so users bring their own Redis client.
+ * Minimal Redis client contract for `RedisCacheHandler`.
+ *
+ * This is deliberately NOT the native shape of any client library. ioredis,
+ * node-redis v4, and @upstash/redis all disagree on TTL argument shapes
+ * (positional `'EX'` vs `{ EX }` vs `{ ex }`), method casing (`sadd` vs
+ * `sAdd`), and array handling in `del` — a contract that pattern-matches one
+ * client lets another silently drop the expiry (TIM-1030: node-redis ignored
+ * the positional `'EX'` and wrote keys with no TTL). Instead, TTL semantics
+ * are explicit in the signature and you adapt your client with a thin
+ * wrapper, so a mismatch is a type error rather than silent unbounded
+ * keyspace growth.
+ *
+ * @example ioredis
+ * ```ts
+ * import Redis from 'ioredis';
+ * const redis = new Redis(process.env.REDIS_URL);
+ * const client: RedisClient = {
+ *   get: (k) => redis.get(k),
+ *   set: (k, v, ttl) => redis.set(k, v, 'EX', ttl),
+ *   expireNX: (k, s) => redis.expire(k, s, 'NX'),
+ *   expireGT: (k, s) => redis.expire(k, s, 'GT'),
+ *   del: (k) => redis.del(k),
+ *   sadd: (k, ...m) => redis.sadd(k, ...m),
+ *   srem: (k, ...m) => redis.srem(k, ...m),
+ *   smembers: (k) => redis.smembers(k),
+ *   ttl: (k) => redis.ttl(k),
+ *   execMulti: async (ops) => {
+ *     const p = redis.multi();
+ *     for (const op of ops) {
+ *       switch (op.op) {
+ *         case 'set': p.set(op.key, op.value, 'EX', op.ttlSeconds); break;
+ *         case 'sadd': p.sadd(op.key, ...op.members); break;
+ *         case 'expireNX': p.expire(op.key, op.seconds, 'NX'); break;
+ *         case 'expireGT': p.expire(op.key, op.seconds, 'GT'); break;
+ *         case 'del': p.del(op.key); break;
+ *       }
+ *     }
+ *     await p.exec();
+ *   },
+ * };
+ * ```
+ *
+ * @example node-redis v4
+ * ```ts
+ * import { createClient } from 'redis';
+ * const redis = createClient({ url: process.env.REDIS_URL });
+ * await redis.connect();
+ * const client: RedisClient = {
+ *   get: (k) => redis.get(k),
+ *   set: (k, v, ttl) => redis.set(k, v, { EX: ttl }),
+ *   expireNX: (k, s) => redis.expire(k, s, 'NX'),
+ *   expireGT: (k, s) => redis.expire(k, s, 'GT'),
+ *   del: (k) => redis.del(k),
+ *   sadd: (k, ...m) => redis.sAdd(k, m),
+ *   srem: (k, ...m) => redis.sRem(k, m),
+ *   smembers: (k) => redis.sMembers(k),
+ *   ttl: (k) => redis.ttl(k),
+ * };
+ * ```
+ *
+ * @example @upstash/redis
+ * ```ts
+ * import { Redis } from '@upstash/redis';
+ * // automaticDeserialization must be off: the handler stores JSON strings
+ * // and parses them itself — auto-parsing would hand back objects.
+ * const redis = new Redis({ url, token, automaticDeserialization: false });
+ * const client: RedisClient = {
+ *   get: (k) => redis.get(k),
+ *   set: (k, v, ttl) => redis.set(k, v, { ex: ttl }),
+ *   expireNX: (k, s) => redis.expire(k, s, 'NX'),
+ *   expireGT: (k, s) => redis.expire(k, s, 'GT'),
+ *   del: (k) => redis.del(k),
+ *   sadd: (k, ...m) => redis.sadd(k, m[0], ...m.slice(1)),
+ *   srem: (k, ...m) => redis.srem(k, m[0], ...m.slice(1)),
+ *   smembers: (k) => redis.smembers(k),
+ *   ttl: (k) => redis.ttl(k),
+ * };
+ * ```
  */
+export type RedisWriteOp =
+  | { op: 'set'; key: string; value: string; ttlSeconds: number }
+  | { op: 'sadd'; key: string; members: string[] }
+  | { op: 'expireNX'; key: string; seconds: number }
+  | { op: 'expireGT'; key: string; seconds: number }
+  | { op: 'del'; key: string };
+
 export interface RedisClient {
+  /** `GET key` — the stored string, or null when absent. */
   get(key: string): Promise<string | null>;
-  set(key: string, value: string, ...args: unknown[]): Promise<unknown>;
-  del(key: string | string[]): Promise<number>;
-  sadd(key: string, ...members: string[]): Promise<number>;
+  /**
+   * `SET key value EX ttlSeconds` — store with an expiry. The TTL is a
+   * required positional argument so no adapter can forget it.
+   */
+  set(key: string, value: string, ttlSeconds: number): Promise<unknown>;
+  /**
+   * `EXPIRE key seconds NX` — set the TTL only if the key has no existing
+   * expiry (Redis 7.0+). Used to set the initial TTL on new tag sets.
+   */
+  expireNX(key: string, seconds: number): Promise<unknown>;
+  /**
+   * `EXPIRE key seconds GT` — update the TTL only if the new value is greater
+   * than the current one (Redis 7.0+). Used to extend tag set TTLs without
+   * allowing a short-TTL writer to shrink them.
+   */
+  expireGT(key: string, seconds: number): Promise<unknown>;
+  /** `DEL key` — delete a single key. Multi-key deletes loop per key. */
+  del(key: string): Promise<unknown>;
+  /** `SADD key member [member ...]` — add members to a set. */
+  sadd(key: string, ...members: string[]): Promise<unknown>;
+  /** `SREM key member [member ...]` — remove members from a set. */
+  srem(key: string, ...members: string[]): Promise<unknown>;
+  /** `SMEMBERS key` — all members of a set. */
   smembers(key: string): Promise<string[]>;
+  /**
+   * `TTL key` — remaining time-to-live in seconds. Returns -2 if the key does
+   * not exist, -1 if the key exists but has no expiry.
+   */
+  ttl(key: string): Promise<number>;
+  /**
+   * Execute a batch of write operations atomically via `MULTI/EXEC`.
+   * When provided, `set()` uses this to make tag-index writes and the data
+   * write atomic — no `invalidate({tag})` can interleave. Optional: when
+   * absent, operations run sequentially (correct but not race-free).
+   */
+  execMulti?(ops: RedisWriteOp[]): Promise<void>;
 }
 
 const KEY_PREFIX = 'timber:cache:';
@@ -23,8 +139,9 @@ const TAG_PREFIX = 'timber:tag:';
  * invalidations. Tag-based invalidation uses Redis Sets to track which keys
  * belong to which tags.
  *
- * Bring your own Redis client — any client implementing the RedisClient
- * interface works (ioredis, node-redis, @upstash/redis, etc.).
+ * Bring your own Redis client wrapped to the {@link RedisClient} contract —
+ * see the adapter examples on the interface for ioredis, node-redis v4, and
+ * @upstash/redis.
  */
 export class RedisCacheHandler implements CacheHandler {
   private client: RedisClient;
@@ -52,26 +169,71 @@ export class RedisCacheHandler implements CacheHandler {
     return { value: entry.value, stale };
   }
 
-  async set(key: string, value: unknown, opts: { ttl: number; tags: string[] }): Promise<void> {
+  async set(
+    key: string,
+    value: unknown,
+    opts: { ttl: number; tags: string[]; generation?: number }
+  ): Promise<void> {
+    warnLossyJsonValue(value, key);
     const ck = this.cacheKey(key);
     const expiresAt = Date.now() + opts.ttl * 1000;
-    const payload = JSON.stringify({ value, expiresAt });
+
+    // Serialize upfront so BigInt/non-serializable errors throw before any
+    // writes — prevents tag indexes pointing at stale data from a prior set().
+    const payload = JSON.stringify({ value, expiresAt, tags: opts.tags });
 
     // Redis TTL with generous margin beyond the logical TTL to allow SWR reads
     // on stale entries. The logical staleness is determined by expiresAt.
     // We use 2x TTL + 60s as the Redis expiry so stale entries remain
     // available for SWR background refetches.
     const redisTtlSeconds = Math.max(opts.ttl * 2 + 60, 120);
-    await this.client.set(ck, payload, 'EX', redisTtlSeconds);
 
-    // Track key membership in each tag set
+    const writeOps: RedisWriteOp[] = [];
     for (const tag of opts.tags) {
-      await this.client.sadd(this.tagKey(tag), key);
+      writeOps.push({ op: 'sadd', key: this.tagKey(tag), members: [key] });
+      writeOps.push({ op: 'expireNX', key: this.tagKey(tag), seconds: redisTtlSeconds });
+      writeOps.push({ op: 'expireGT', key: this.tagKey(tag), seconds: redisTtlSeconds });
+    }
+    writeOps.push({ op: 'set', key: ck, value: payload, ttlSeconds: redisTtlSeconds });
+
+    if (this.client.execMulti) {
+      await this.client.execMulti(writeOps);
+    } else {
+      for (const op of writeOps) {
+        await this.execOp(op);
+      }
+    }
+  }
+
+  private async execOp(op: RedisWriteOp): Promise<void> {
+    switch (op.op) {
+      case 'set':
+        await this.client.set(op.key, op.value, op.ttlSeconds);
+        break;
+      case 'sadd':
+        await this.client.sadd(op.key, ...op.members);
+        break;
+      case 'expireNX':
+        await this.client.expireNX(op.key, op.seconds);
+        break;
+      case 'expireGT':
+        await this.client.expireGT(op.key, op.seconds);
+        break;
+      case 'del':
+        await this.client.del(op.key);
+        break;
     }
   }
 
   async invalidate(opts: { key?: string; tag?: string }): Promise<void> {
     if (opts.key) {
+      const raw = await this.client.get(this.cacheKey(opts.key));
+      if (raw !== null) {
+        const entry = JSON.parse(raw) as { tags?: string[] };
+        if (entry.tags) {
+          await Promise.all(entry.tags.map((tag) => this.client.srem(this.tagKey(tag), opts.key!)));
+        }
+      }
       await this.client.del(this.cacheKey(opts.key));
     }
 
@@ -79,13 +241,29 @@ export class RedisCacheHandler implements CacheHandler {
       const tk = this.tagKey(opts.tag);
       const keys = await this.client.smembers(tk);
 
-      if (keys.length > 0) {
-        const cacheKeys = keys.map((k) => this.cacheKey(k));
-        await this.client.del(cacheKeys);
-      }
+      // Re-check each member before deleting — the tag set can contain stale
+      // memberships from entries whose tags changed since they were added.
+      // Mirrors TagAwareCacheHandler's eager strategy (tag-aware-handler.ts:183-198).
+      await Promise.all(
+        keys.map(async (k) => {
+          const raw = await this.client.get(this.cacheKey(k));
+          if (raw === null) {
+            await this.client.srem(tk, k);
+            return;
+          }
+          const entry = JSON.parse(raw) as { tags?: string[] };
+          if (entry.tags?.includes(opts.tag!)) {
+            await this.client.del(this.cacheKey(k));
+          }
+          await this.client.srem(tk, k);
+        })
+      );
 
-      // Clean up the tag set itself
-      await this.client.del(tk);
+      // Clean up the now-empty tag set so it doesn't consume memory
+      const remaining = await this.client.smembers(tk);
+      if (remaining.length === 0) {
+        await this.client.del(tk);
+      }
     }
   }
 }