@selvajs/server 0.2.0-beta.2 → 0.2.0-beta.3

package/dist/definitions/__tests__/definition-service.test.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"definition-service.test.js","sourceRoot":"","sources":["../../../src/definitions/__tests__/definition-service.test.ts"],"names":[],"mappings":"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"}

package/dist/definitions/definition-service.d.ts

@@ -39,7 +39,7 @@ export interface CreateDefinitionRecord {
  *   blob and is filtered out of list endpoints by default.
  *
  *   uploadVersion — append-only:
- *     1. Resolve next versionNumber from the version list
+ *     1. Reserve next versionNumber from the record's monotonic counter
  *     2. Upload blob to versions/v{N}.{ext}
  *     3. Insert DefinitionVersion row
  *     4. Advance draft pointer (live unchanged)

package/dist/definitions/definition-service.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"definition-service.d.ts","sourceRoot":"","sources":["../../src/definitions/definition-service.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EACX,aAAa,EACb,gBAAgB,EAChB,cAAc,EACd,gBAAgB,EAChB,iBAAiB,EACjB,iBAAiB,EACjB,mBAAmB,EACnB,QAAQ,EACR,MAAM,mBAAmB,CAAC;AAG3B;;;;;;;GAOG;AACH,MAAM,WAAW,sBAAsB;IACtC,IAAI,EAAE,MAAM,CAAC;IACb,SAAS,EAAE,MAAM,CAAC;IAClB,OAAO,EAAE,MAAM,CAAC;IAChB,OAAO,EAAE,iBAAiB,CAAC;IAC3B,gBAAgB,CAAC,EAAE,MAAM,CAAC;IAC1B,WAAW,EAAE,MAAM,CAAC;IACpB,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,IAAI,CAAC,EAAE,MAAM,EAAE,CAAC;IAChB,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,eAAe,CAAC,EAAE,MAAM,CAAC;CACzB;AAED;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA4BG;AACH,qBAAa,iBAAiB;IAE5B,OAAO,CAAC,IAAI;IACZ,OAAO,CAAC,OAAO;gBADP,IAAI,EAAE,aAAa,EACnB,OAAO,EAAE,gBAAgB;IAG5B,MAAM,CACX,GAAG,EAAE,cAAc,EACnB,KAAK,EAAE,sBAAsB,EAC7B,IAAI,EAAE,UAAU,EAChB,MAAM,EAAE,QAAQ,GACd,OAAO,CAAC;QAAE,MAAM,EAAE,gBAAgB,CAAC;QAAC,OAAO,EAAE,iBAAiB,CAAA;KAAE,CAAC;IA4DpE;;;;OAIG;IACG,aAAa,CAClB,GAAG,EAAE,cAAc,EACnB,IAAI,EAAE,MAAM,EACZ,IAAI,EAAE,UAAU,EAChB,GAAG,EAAE,iBAAiB,EACtB,YAAY,EAAE,MAAM,EACpB,MAAM,EAAE,QAAQ,EAChB,UAAU,CAAC,EAAE,MAAM,GACjB,OAAO,CAAC,iBAAiB,CAAC;IAiC7B;;;;OAIG;IACG,OAAO,CAAC,GAAG,EAAE,cAAc,EAAE,IAAI,EAAE,MAAM,EAAE,SAAS,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,iBAAiB,CAAC;IAoB1F,aAAa,CAAC,GAAG,EAAE,cAAc,EAAE,IAAI,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAUlF,UAAU,CAAC,GAAG,EAAE,cAAc,EAAE,IAAI,EAAE,MAAM,EAAE,KAAK,EAAE,mBAAmB,GAAG,OAAO,CAAC,IAAI,CAAC;IAIxF,cAAc,CAAC,GAAG,EAAE,cAAc,EAAE,IAAI,EAAE,MAAM,EAAE,SAAS,EAAE,UAAU,GAAG,OAAO,CAAC,MAAM,CAAC;IAQzF,MAAM,CAAC,GAAG,EAAE,cAAc,EAAE,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;CAc9D"}
+{"version":3,"file":"definition-service.d.ts","sourceRoot":"","sources":["../../src/definitions/definition-service.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EACX,aAAa,EACb,gBAAgB,EAChB,cAAc,EACd,gBAAgB,EAChB,iBAAiB,EACjB,iBAAiB,EACjB,mBAAmB,EACnB,QAAQ,EACR,MAAM,mBAAmB,CAAC;AAG3B;;;;;;;GAOG;AACH,MAAM,WAAW,sBAAsB;IACtC,IAAI,EAAE,MAAM,CAAC;IACb,SAAS,EAAE,MAAM,CAAC;IAClB,OAAO,EAAE,MAAM,CAAC;IAChB,OAAO,EAAE,iBAAiB,CAAC;IAC3B,gBAAgB,CAAC,EAAE,MAAM,CAAC;IAC1B,WAAW,EAAE,MAAM,CAAC;IACpB,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,IAAI,CAAC,EAAE,MAAM,EAAE,CAAC;IAChB,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,eAAe,CAAC,EAAE,MAAM,CAAC;CACzB;AAED;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA4BG;AACH,qBAAa,iBAAiB;IAE5B,OAAO,CAAC,IAAI;IACZ,OAAO,CAAC,OAAO;gBADP,IAAI,EAAE,aAAa,EACnB,OAAO,EAAE,gBAAgB;IAG5B,MAAM,CACX,GAAG,EAAE,cAAc,EACnB,KAAK,EAAE,sBAAsB,EAC7B,IAAI,EAAE,UAAU,EAChB,MAAM,EAAE,QAAQ,GACd,OAAO,CAAC;QAAE,MAAM,EAAE,gBAAgB,CAAC;QAAC,OAAO,EAAE,iBAAiB,CAAA;KAAE,CAAC;IA8DpE;;;;OAIG;IACG,aAAa,CAClB,GAAG,EAAE,cAAc,EACnB,IAAI,EAAE,MAAM,EACZ,IAAI,EAAE,UAAU,EAChB,GAAG,EAAE,iBAAiB,EACtB,YAAY,EAAE,MAAM,EACpB,MAAM,EAAE,QAAQ,EAChB,UAAU,CAAC,EAAE,MAAM,GACjB,OAAO,CAAC,iBAAiB,CAAC;IAmC7B;;;;OAIG;IACG,OAAO,CAAC,GAAG,EAAE,cAAc,EAAE,IAAI,EAAE,MAAM,EAAE,SAAS,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,iBAAiB,CAAC;IAoB1F,aAAa,CAAC,GAAG,EAAE,cAAc,EAAE,IAAI,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAUlF,UAAU,CAAC,GAAG,EAAE,cAAc,EAAE,IAAI,EAAE,MAAM,EAAE,KAAK,EAAE,mBAAmB,GAAG,OAAO,CAAC,IAAI,CAAC;IAIxF,cAAc,CAAC,GAAG,EAAE,cAAc,EAAE,IAAI,EAAE,MAAM,EAAE,SAAS,EAAE,UAAU,GAAG,OAAO,CAAC,MAAM,CAAC;IAQzF,MAAM,CAAC,GAAG,EAAE,cAAc,EAAE,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;CAc9D"}

package/dist/definitions/definition-service.js

@@ -19,7 +19,7 @@ import { ProviderError, definitionPaths } from '@selvajs/platform';
  *   blob and is filtered out of list endpoints by default.
  *
  *   uploadVersion — append-only:
- *     1. Resolve next versionNumber from the version list
+ *     1. Reserve next versionNumber from the record's monotonic counter
  *     2. Upload blob to versions/v{N}.{ext}
  *     3. Insert DefinitionVersion row
  *     4. Advance draft pointer (live unchanged)
@@ -53,6 +53,8 @@ export class DefinitionService {
             computeServerId: input.computeServerId,
             status: 'pending',
             solveCount: 0,
+            // v1 is created below with versionNumber 1, so the next upload reserves 2.
+            nextVersionNumber: 2,
             liveVersionId: null,
             draftVersionId: null,
             createdAt: now,
@@ -99,9 +101,11 @@ export class DefinitionService {
         const existing = await this.data.definitions.get(ctx, guid);
         if (!existing)
             throw new ProviderError(`Definition not found: ${guid}`, 404);
-        // Highest existing versionNumber + 1; covers gaps from deletions.
-        const versions = await this.data.definitions.listVersions(ctx, guid, { limit: 1 });
-        const next = (versions.items[0]?.versionNumber ?? 0) + 1;
+        // Reserve the next version number from the record's monotonic counter — NOT
+        // max(existing)+1, which reused a number after delete-latest and collided
+        // the `fileKey` (stale blob served for new content). The counter only ever
+        // advances, so a delete-then-reupload gets a fresh number and fresh key.
+        const next = await this.data.definitions.reserveNextVersionNumber(ctx, guid);
         const versionId = randomUUID();
         const fileKey = definitionPaths.version(guid, next, ext);
         await this.storage.put(fileKey, file, 'application/octet-stream');

package/dist/definitions/definition-service.js.map

@@ -1 +1 @@
-{"version":3,"file":"definition-service.js","sourceRoot":"","sources":["../../src/definitions/definition-service.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"definition-service.js","sourceRoot":"","sources":["../../src/definitions/definition-service.ts"],"names":[],"mappings":"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"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@selvajs/server",
-  "version": "0.2.0-beta.2",
+  "version": "0.2.0-beta.3",
   "description": "Transport-agnostic compute/solve/definitions server building blocks for apps built on the Selva engine (limits, rate limiting, SSRF guard, input transform, solve pipeline, definition service + render loader)",
   "license": "MIT",
   "publishConfig": {
@@ -66,7 +66,7 @@
     "src"
   ],
   "dependencies": {
-    "@selvajs/compute": "^3.1.0-beta.5",
+    "@selvajs/compute": "^3.1.0-beta.6",
     "@selvajs/platform": "0.14.3-beta.0",
     "@selvajs/schemas": "4.7.0-beta.0"
   },

package/src/compute/__tests__/client-cache.test.ts

@@ -43,6 +43,8 @@ function baseConfig() {
 	return {
 		maxSolveDurationMs: 30_000,
 		maxConcurrentSolves: 4,
+		maxQueueDepth: 0,
+		queueWaitMs: 0,
 		cachesolve: true,
 		cacheerroredsolves: false,
 		reuseServerDefinitionCache: true,
@@ -173,6 +175,24 @@ describe('createClientCache — scheduler concurrency (audit B6)', () => {
 	});
 });
 
+describe('createClientCache — scheduler backpressure (audit B7)', () => {
+	it('forwards non-zero queue bounds to the scheduler', async () => {
+		const cache = createClientCache({ ...baseConfig(), maxQueueDepth: 12, queueWaitMs: 90_000 });
+		await cache.getClient(server('s1'));
+		expect(createdSchedulerOptions[0].maxQueueDepth).toBe(12);
+		expect(createdSchedulerOptions[0].queueWaitMs).toBe(90_000);
+	});
+
+	it('maps a 0 (disabled) queue bound to undefined so the scheduler stays unbounded', async () => {
+		// The scheduler treats undefined as unbounded/no-deadline; passing 0 would
+		// shed EVERY queued solve. Our `0 = off` convention must become undefined.
+		const cache = createClientCache({ ...baseConfig(), maxQueueDepth: 0, queueWaitMs: 0 });
+		await cache.getClient(server('s1'));
+		expect(createdSchedulerOptions[0].maxQueueDepth).toBeUndefined();
+		expect(createdSchedulerOptions[0].queueWaitMs).toBeUndefined();
+	});
+});
+
 describe('createClientCache — per-request telemetry sequence counters', () => {
 	it('onServerTiming bumps rhinoTiming.seq on every write', async () => {
 		const cache = createClientCache(baseConfig());

package/src/compute/__tests__/definition-byte-cache.test.ts

@@ -0,0 +1,129 @@
+import { describe, it, expect, vi } from 'vitest';
+import { createDefinitionByteCache } from '../definition-byte-cache.js';
+
+/** A `Uint8Array` of `n` bytes filled with a marker so equality is checkable. */
+function bytes(n: number, marker = 0): Uint8Array {
+	return new Uint8Array(n).fill(marker);
+}
+
+describe('createDefinitionByteCache', () => {
+	it('serves a warm entry without re-invoking the loader (hit) and reports it', async () => {
+		const cache = createDefinitionByteCache(10 * 1024 * 1024);
+		const load = vi.fn(async () => bytes(1024, 7));
+
+		const first = await cache.getOrLoad('v-1', load).load();
+		const second = await cache.getOrLoad('v-1', load).load();
+
+		expect(first).toEqual(second);
+		expect(load).toHaveBeenCalledTimes(1); // second call served from cache
+		const s = cache.stats();
+		expect(s.hits).toBe(1);
+		expect(s.misses).toBe(1);
+		expect(s.entries).toBe(1);
+		expect(s.bytes).toBe(1024);
+	});
+
+	it('per-ref outcome distinguishes miss (loader) from hit (warm)', async () => {
+		const cache = createDefinitionByteCache(10 * 1024 * 1024);
+		const load = async () => bytes(512);
+
+		const refMiss = cache.getOrLoad('v-1', load);
+		await refMiss.load();
+		expect(refMiss.outcome).toEqual({ loaded: true, fromCache: false });
+
+		const refHit = cache.getOrLoad('v-1', load);
+		await refHit.load();
+		expect(refHit.outcome).toEqual({ loaded: true, fromCache: true });
+	});
+
+	it("a ref whose load() is never called leaves outcome.loaded false (the 'skipped' verdict)", () => {
+		const cache = createDefinitionByteCache(10 * 1024 * 1024);
+		const ref = cache.getOrLoad('v-1', async () => bytes(1));
+		// The scheduler served a pointer-known solve — load() never ran.
+		expect(ref.outcome).toEqual({ loaded: false, fromCache: false });
+	});
+
+	it('evicts least-recently-used entries when the byte budget is exceeded', async () => {
+		// Budget holds ~2 of these 1 KB entries.
+		const cache = createDefinitionByteCache(2 * 1024);
+		const load = (marker: number) => async () => bytes(1024, marker);
+
+		await cache.getOrLoad('a', load(1)).load(); // [a]
+		await cache.getOrLoad('b', load(2)).load(); // [a,b]
+		// Touch 'a' so 'b' becomes the LRU victim.
+		await cache.getOrLoad('a', load(1)).load(); // hit → [b,a]
+		await cache.getOrLoad('c', load(3)).load(); // insert c → evict b → [a,c]
+
+		expect(cache.stats().entries).toBe(2);
+		expect(cache.stats().evictions).toBe(1);
+		expect(cache.stats().bytes).toBe(2 * 1024);
+
+		// 'a' survived (it was touched, so 'b' was the LRU victim) → served from
+		// cache without the loader. Checked BEFORE re-loading 'b', since bringing 'b'
+		// back would itself evict 'a' under the 2-entry budget.
+		const aLoad = vi.fn(load(1));
+		await cache.getOrLoad('a', aLoad).load();
+		expect(aLoad).toHaveBeenCalledTimes(0);
+
+		// 'b' was evicted → its next load calls the loader again (miss).
+		const bLoad = vi.fn(load(2));
+		await cache.getOrLoad('b', bLoad).load();
+		expect(bLoad).toHaveBeenCalledTimes(1);
+	});
+
+	it('never retains an entry larger than the whole budget (serves through, caches nothing)', async () => {
+		const cache = createDefinitionByteCache(1024);
+		const load = vi.fn(async () => bytes(4096));
+
+		const out = await cache.getOrLoad('big', load).load();
+		expect(out.byteLength).toBe(4096); // still served
+		expect(cache.stats().entries).toBe(0); // but not retained
+		expect(cache.stats().bytes).toBe(0);
+
+		// Every load re-fetches — nothing was cached.
+		await cache.getOrLoad('big', load).load();
+		expect(load).toHaveBeenCalledTimes(2);
+	});
+
+	it('keys on the passed version id — two versions that reused a fileKey never collide', async () => {
+		// The trap this cache exists to avoid: delete-latest-then-reupload reused a
+		// fileKey, but the version id (the KEY) is always fresh. Distinct ids →
+		// distinct entries, so the new version never serves the old bytes.
+		const cache = createDefinitionByteCache(10 * 1024 * 1024);
+		const oldBytes = bytes(1024, 1);
+		const newBytes = bytes(1024, 2);
+
+		const a = await cache.getOrLoad('version-old', async () => oldBytes).load();
+		const b = await cache.getOrLoad('version-new', async () => newBytes).load();
+
+		expect(a).toEqual(oldBytes);
+		expect(b).toEqual(newBytes);
+		expect(a).not.toEqual(b); // no cross-contamination despite a shared fileKey
+		expect(cache.stats().entries).toBe(2);
+	});
+
+	it('budget 0 disables caching entirely (every load hits the loader, nothing retained)', async () => {
+		const cache = createDefinitionByteCache(0);
+		const load = vi.fn(async () => bytes(16));
+
+		const ref1 = cache.getOrLoad('v-1', load);
+		await ref1.load();
+		await cache.getOrLoad('v-1', load).load();
+
+		expect(load).toHaveBeenCalledTimes(2);
+		expect(cache.stats().entries).toBe(0);
+		expect(cache.stats().bytes).toBe(0);
+		// Outcome still reports loaded, but never fromCache.
+		expect(ref1.outcome).toEqual({ loaded: true, fromCache: false });
+	});
+
+	it('re-storing the same key updates bytes without double-counting the budget', async () => {
+		const cache = createDefinitionByteCache(10 * 1024 * 1024);
+		// clear() to force a re-store path: first load caches, clear drops it, second caches again.
+		await cache.getOrLoad('v-1', async () => bytes(1024)).load();
+		expect(cache.stats().bytes).toBe(1024);
+		cache.clear();
+		expect(cache.stats().bytes).toBe(0);
+		expect(cache.stats().entries).toBe(0);
+	});
+});

package/src/compute/__tests__/solve-cache.test.ts

@@ -0,0 +1,268 @@
+/**
+ * Tests for the durable L2 solve-cache building blocks (Phase 3):
+ *   - the in-memory backend (per-definition count quota + global byte backstop),
+ *   - the SHA-256 key derivation (org isolation, version keyspace, config fold),
+ *   - the envelope codec (round-trip, corruption → miss),
+ *   - the in-process single-flight (coalescing, release-on-settle).
+ *
+ * `@selvajs/compute`'s `stableStringify` is the only external dependency of the
+ * key module; it's a real export (deterministic sorted-key JSON), so these run
+ * without mocking.
+ */
+
+import { describe, it, expect } from 'vitest';
+import { SYSTEM_CONTEXT, type SolveCacheKey } from '@selvajs/platform';
+import { createMemorySolveResultCache } from '../memory-solve-cache.js';
+import { deriveSolveCacheInputKey } from '../solve-cache-key.js';
+import {
+	encodeSolveCacheEntry,
+	decodeSolveCacheEntry,
+	gunzipEntryBody
+} from '../solve-cache-envelope.js';
+import { createSolveCacheSingleFlight } from '../solve-cache-single-flight.js';
+import { gzipSync } from 'node:zlib';
+
+const ctx = SYSTEM_CONTEXT;
+
+function key(over: Partial<SolveCacheKey> = {}): SolveCacheKey {
+	return {
+		orgId: over.orgId ?? 'org-1',
+		definitionId: over.definitionId ?? 'def-1',
+		versionId: over.versionId ?? 'v-1',
+		inputKey: over.inputKey ?? 'in-1'
+	};
+}
+
+const bytes = (n: number) => new Uint8Array(n).fill(1);
+
+// ============================================================================
+// Memory backend
+// ============================================================================
+
+describe('createMemorySolveResultCache — round-trip + quota', () => {
+	it('stores then serves the exact bytes on a hit, and bumps counters', async () => {
+		const cache = createMemorySolveResultCache(0);
+		const payload = new Uint8Array([9, 8, 7]);
+		await cache.set(ctx, key(), payload, { maxEntriesForDefinition: 5 });
+		const got = await cache.get(ctx, key());
+		expect(got).toEqual(payload);
+		expect(await cache.get(ctx, key({ inputKey: 'absent' }))).toBeNull();
+		const stats = cache.stats();
+		expect(stats.hits).toBe(1);
+		expect(stats.misses).toBe(1);
+		expect(stats.writes).toBe(1);
+		expect(stats.entries).toBe(1);
+	});
+
+	it('quota 0 (caching off for the definition) stores nothing', async () => {
+		const cache = createMemorySolveResultCache(0);
+		await cache.set(ctx, key(), bytes(10), { maxEntriesForDefinition: 0 });
+		expect(await cache.get(ctx, key())).toBeNull();
+		expect(cache.stats().entries).toBe(0);
+	});
+
+	it('evicts LRU WITHIN a definition down to its quota, not across definitions', async () => {
+		const cache = createMemorySolveResultCache(0);
+		// def-A gets a quota of 2; write 3 distinct inputs → oldest evicted.
+		await cache.set(ctx, key({ definitionId: 'A', inputKey: 'a1' }), bytes(1), {
+			maxEntriesForDefinition: 2
+		});
+		await cache.set(ctx, key({ definitionId: 'A', inputKey: 'a2' }), bytes(1), {
+			maxEntriesForDefinition: 2
+		});
+		// def-B writes an entry in between — must NOT be evicted by def-A's churn.
+		await cache.set(ctx, key({ definitionId: 'B', inputKey: 'b1' }), bytes(1), {
+			maxEntriesForDefinition: 2
+		});
+		await cache.set(ctx, key({ definitionId: 'A', inputKey: 'a3' }), bytes(1), {
+			maxEntriesForDefinition: 2
+		});
+
+		expect(await cache.get(ctx, key({ definitionId: 'A', inputKey: 'a1' }))).toBeNull(); // evicted
+		expect(await cache.get(ctx, key({ definitionId: 'A', inputKey: 'a2' }))).not.toBeNull();
+		expect(await cache.get(ctx, key({ definitionId: 'A', inputKey: 'a3' }))).not.toBeNull();
+		expect(await cache.get(ctx, key({ definitionId: 'B', inputKey: 'b1' }))).not.toBeNull(); // untouched
+		expect(cache.stats().quotaEvictions).toBe(1);
+	});
+
+	it('LRU-within-definition respects recency: a re-read entry is not the one evicted', async () => {
+		const cache = createMemorySolveResultCache(0);
+		await cache.set(ctx, key({ inputKey: 'x' }), bytes(1), { maxEntriesForDefinition: 2 });
+		await cache.set(ctx, key({ inputKey: 'y' }), bytes(1), { maxEntriesForDefinition: 2 });
+		// Touch x so y becomes the LRU.
+		await cache.get(ctx, key({ inputKey: 'x' }));
+		await cache.set(ctx, key({ inputKey: 'z' }), bytes(1), { maxEntriesForDefinition: 2 });
+		expect(await cache.get(ctx, key({ inputKey: 'y' }))).toBeNull(); // y was LRU → evicted
+		expect(await cache.get(ctx, key({ inputKey: 'x' }))).not.toBeNull();
+	});
+
+	it('the global byte backstop evicts across definitions regardless of counts', async () => {
+		// 30-byte budget; three 20-byte entries in different definitions with generous
+		// per-definition quotas → the backstop evicts the global LRU to fit.
+		const cache = createMemorySolveResultCache(30);
+		await cache.set(ctx, key({ definitionId: 'A', inputKey: 'a' }), bytes(20), {
+			maxEntriesForDefinition: 100
+		});
+		await cache.set(ctx, key({ definitionId: 'B', inputKey: 'b' }), bytes(20), {
+			maxEntriesForDefinition: 100
+		});
+		// A's entry is the global LRU and gets evicted to keep total <= 30.
+		expect(await cache.get(ctx, key({ definitionId: 'A', inputKey: 'a' }))).toBeNull();
+		expect(await cache.get(ctx, key({ definitionId: 'B', inputKey: 'b' }))).not.toBeNull();
+		expect(cache.stats().byteEvictions).toBeGreaterThanOrEqual(1);
+		expect(cache.stats().bytes).toBeLessThanOrEqual(30);
+	});
+
+	it('an entry larger than the whole byte backstop is served once but not retained', async () => {
+		const cache = createMemorySolveResultCache(10);
+		await cache.set(ctx, key(), bytes(50), { maxEntriesForDefinition: 100 });
+		expect(await cache.get(ctx, key())).toBeNull();
+		expect(cache.stats().bytes).toBe(0);
+	});
+
+	it('org id is part of the key: the same definition/version/input under two orgs is isolated', async () => {
+		const cache = createMemorySolveResultCache(0);
+		await cache.set(ctx, key({ orgId: 'org-A' }), new Uint8Array([1]), {
+			maxEntriesForDefinition: 5
+		});
+		expect(await cache.get(ctx, key({ orgId: 'org-B' }))).toBeNull(); // no cross-tenant read
+		expect(await cache.get(ctx, key({ orgId: 'org-A' }))).toEqual(new Uint8Array([1]));
+	});
+
+	it('replacing an existing key updates bytes in place without double-counting', async () => {
+		const cache = createMemorySolveResultCache(0);
+		await cache.set(ctx, key(), bytes(10), { maxEntriesForDefinition: 5 });
+		await cache.set(ctx, key(), bytes(4), { maxEntriesForDefinition: 5 });
+		expect(cache.stats().entries).toBe(1);
+		expect(cache.stats().bytes).toBe(4);
+	});
+
+	it('a version bump is a fresh keyspace (old version entries do not collide)', async () => {
+		const cache = createMemorySolveResultCache(0);
+		await cache.set(ctx, key({ versionId: 'v-1' }), new Uint8Array([1]), {
+			maxEntriesForDefinition: 5
+		});
+		// New version, same definition/input key → distinct entry, old one still there.
+		expect(await cache.get(ctx, key({ versionId: 'v-2' }))).toBeNull();
+		await cache.set(ctx, key({ versionId: 'v-2' }), new Uint8Array([2]), {
+			maxEntriesForDefinition: 5
+		});
+		expect(await cache.get(ctx, key({ versionId: 'v-1' }))).toEqual(new Uint8Array([1]));
+		expect(await cache.get(ctx, key({ versionId: 'v-2' }))).toEqual(new Uint8Array([2]));
+	});
+});
+
+// ============================================================================
+// Key derivation
+// ============================================================================
+
+describe('deriveSolveCacheInputKey', () => {
+	const tree = { a: 1, b: [2, 3] };
+
+	it('is deterministic for the same tree + config', () => {
+		const k1 = deriveSolveCacheInputKey(tree, { computeServerId: 's1' });
+		const k2 = deriveSolveCacheInputKey(tree, { computeServerId: 's1' });
+		expect(k1.hash).toBe(k2.hash);
+		expect(k1.hash).toMatch(/^[0-9a-f]{64}$/); // SHA-256 hex
+	});
+
+	it('differs when the tree differs', () => {
+		const a = deriveSolveCacheInputKey({ a: 1 }, {});
+		const b = deriveSolveCacheInputKey({ a: 2 }, {});
+		expect(a.hash).not.toBe(b.hash);
+	});
+
+	it('folds the config subset in (R8): a different compute server → different key', () => {
+		const a = deriveSolveCacheInputKey(tree, { computeServerId: 's1' });
+		const b = deriveSolveCacheInputKey(tree, { computeServerId: 's2' });
+		expect(a.hash).not.toBe(b.hash);
+	});
+
+	it('exposes the canonical preimage for hit-time comparison', () => {
+		const k = deriveSolveCacheInputKey(tree, { computeServerId: 's1' });
+		expect(k.canonical).toContain('"tree"');
+		expect(k.canonical).toContain('"config"');
+	});
+});
+
+// ============================================================================
+// Envelope codec
+// ============================================================================
+
+describe('solve-cache envelope codec', () => {
+	const header = { errorCount: 1, warningCount: 2, serializedBytes: 42, inputHash: 'abc' };
+
+	it('round-trips header + gzipped body', () => {
+		const body = new Uint8Array(gzipSync(Buffer.from('{"hello":"world"}')));
+		const encoded = encodeSolveCacheEntry(header, body);
+		const decoded = decodeSolveCacheEntry(encoded);
+		expect(decoded).not.toBeNull();
+		expect(decoded!.header).toEqual(header);
+		expect(gunzipEntryBody(decoded!.gzippedBody)).toBe('{"hello":"world"}');
+	});
+
+	it('returns null for a truncated / malformed entry (→ treated as a miss)', () => {
+		expect(decodeSolveCacheEntry(new Uint8Array([1, 2]))).toBeNull(); // too short for length prefix
+		const encoded = encodeSolveCacheEntry(header, new Uint8Array([1, 2, 3]));
+		expect(decodeSolveCacheEntry(encoded.slice(0, 6))).toBeNull(); // header claims more than present
+	});
+
+	it('returns null when the header JSON is missing required fields', () => {
+		// Hand-craft an entry whose header is valid JSON but the wrong shape.
+		const badHeader = Buffer.from(JSON.stringify({ nope: true }), 'utf8');
+		const out = Buffer.allocUnsafe(4 + badHeader.byteLength);
+		out.writeUInt32BE(badHeader.byteLength, 0);
+		badHeader.copy(out, 4);
+		expect(decodeSolveCacheEntry(new Uint8Array(out))).toBeNull();
+	});
+});
+
+// ============================================================================
+// Single-flight
+// ============================================================================
+
+describe('createSolveCacheSingleFlight', () => {
+	it('coalesces concurrent identical calls into one execution', async () => {
+		const sf = createSolveCacheSingleFlight();
+		let runs = 0;
+		let release!: (v: number) => void;
+		const gate = new Promise<number>((r) => (release = r));
+		const work = () => {
+			runs += 1;
+			return gate;
+		};
+		const p1 = sf.run('k', work);
+		const p2 = sf.run('k', work);
+		expect(sf.inFlight()).toBe(1);
+		release(7);
+		expect(await p1).toBe(7);
+		expect(await p2).toBe(7); // shared result
+		expect(runs).toBe(1); // executed once
+	});
+
+	it('runs distinct keys independently', async () => {
+		const sf = createSolveCacheSingleFlight();
+		let runs = 0;
+		await Promise.all([sf.run('a', async () => void runs++), sf.run('b', async () => void runs++)]);
+		expect(runs).toBe(2);
+	});
+
+	it('releases the key after settle so a later call runs fresh', async () => {
+		const sf = createSolveCacheSingleFlight();
+		let runs = 0;
+		await sf.run('k', async () => void runs++);
+		expect(sf.inFlight()).toBe(0);
+		await sf.run('k', async () => void runs++);
+		expect(runs).toBe(2);
+	});
+
+	it('a rejection is shared by concurrent waiters and still frees the key', async () => {
+		const sf = createSolveCacheSingleFlight();
+		const boom = () => Promise.reject(new Error('boom'));
+		const p1 = sf.run('k', boom);
+		const p2 = sf.run('k', boom);
+		await expect(p1).rejects.toThrow('boom');
+		await expect(p2).rejects.toThrow('boom');
+		expect(sf.inFlight()).toBe(0);
+	});
+});