@zlink-systems/framework 0.30.3 → 0.32.0

package/src/runtime/locations/location-store-repository.ts

@@ -1,3 +1,4 @@
+import { macrotaskBoundary } from '../abort';
 import type { ZLinkRuntimeMetrics } from '../diagnostics/runtime-metrics';
 import { routingIdsEqual, toBackendRoutingId } from '../routing-id';
 import {
@@ -205,12 +206,6 @@ interface OwnerCleanupCandidate {
   readonly scanVersion: ZLinkStoreVersion;
 }
 
-interface OwnerCleanupRecord {
-  readonly descriptor: OwnedStoreRecord;
-}
-
-const MAX_OWNER_CLEANUP_BATCH_ROWS = 2_047;
-
 /**
  * Maps framework domain records to the minimal provider SPI.
  *
@@ -461,7 +456,10 @@ export class ZLinkLocationStoreRepository extends ZLinkInMemoryLocationStore {
           },
           signal
         );
-        if (result.kind === 'conflict') continue;
+        if (result.kind === 'conflict') {
+          await macrotaskBoundary();
+          continue;
+        }
         const storeVersion = result.putVersions.find(
           (entry) => entry.key.value === rowKey.value
         )?.version;
@@ -547,7 +545,12 @@ export class ZLinkLocationStoreRepository extends ZLinkInMemoryLocationStore {
               }
             )
           : [];
-      if (membershipConditions === undefined) return { kind: 'conflict', current: snapshot };
+      if (!Array.isArray(membershipConditions))
+        return {
+          kind: 'conflict',
+          current: snapshot,
+          membershipFailure: membershipConditions.failureKind
+        };
       const result = await this.provider.write(
         {
           conditions: [
@@ -610,7 +613,10 @@ export class ZLinkLocationStoreRepository extends ZLinkInMemoryLocationStore {
         },
         signal
       );
-      if (result.kind === 'conflict') continue;
+      if (result.kind === 'conflict') {
+        await macrotaskBoundary();
+        continue;
+      }
       const storeVersion = result.putVersions.find(
         (entry) => entry.key.value === rowKey.value
       )?.version;
@@ -1191,7 +1197,7 @@ export class ZLinkLocationStoreRepository extends ZLinkInMemoryLocationStore {
           signal,
           aggregate.targetOwner
         );
-        if (conditions === undefined) return { kind: 'stale' };
+        if (!Array.isArray(conditions)) return { kind: 'stale' };
         membershipConditions.push(
           ...conditions.filter(
             (condition) =>
@@ -1323,11 +1329,18 @@ export class ZLinkLocationStoreRepository extends ZLinkInMemoryLocationStore {
     key: ZLinkAuthorityKey,
     expectedStoreVersion: string,
     signal?: AbortSignal,
-    request?: ZLinkEndedOwnerReleaseIntent
+    request?: ZLinkEndedOwnerReleaseIntent,
+    requiredOwner?: ZLinkLocationOwnerToken
   ): Promise<boolean> {
     return (
-      (await this.tryReleaseEndedReservation(key, expectedStoreVersion, signal, request)) ===
-      'reclaimed'
+      (await this.tryReleaseEndedReservation(
+        key,
+        expectedStoreVersion,
+        signal,
+        request,
+        undefined,
+        requiredOwner
+      )) === 'reclaimed'
     );
   }
 
@@ -1335,160 +1348,189 @@ export class ZLinkLocationStoreRepository extends ZLinkInMemoryLocationStore {
     key: ZLinkAuthorityKey,
     expectedStoreVersion: string,
     signal?: AbortSignal,
-    request?: ZLinkEndedOwnerReleaseIntent
+    request?: ZLinkEndedOwnerReleaseIntent,
+    deadlineUnixMs?: bigint,
+    requiredOwner?: ZLinkLocationOwnerToken
   ): Promise<'notReclaimable' | 'conflict' | 'reclaimed'> {
-    const rowKey = authorityKey(key.value);
-    const current = await this.provider.read(rowKey, signal);
-    if (current.kind === 'missing' || current.value.version.value !== expectedStoreVersion)
-      return 'conflict';
-    const record = decodeAuthorityRecord(current.value.bytes);
-    const snapshot = record.snapshot;
-    if (
-      snapshot.allocation.state === 'active'
-        ? request === undefined
-        : snapshot.pendingCreation === undefined
-    )
-      return 'notReclaimable';
-    const leaseKey = ownerKey(snapshot.ownerId);
-    const descriptorKey = meshKey(
-      snapshot.allocation.descriptor.meshName,
-      snapshot.allocation.descriptor.rid
-    );
-    const capacityRowKey = capacityKey(
-      snapshot.allocation.descriptor.meshName,
-      String(snapshot.allocation.descriptor.rid)
-    );
-    const [lease, descriptor, capacity] = await Promise.all([
-      this.provider.read(leaseKey, signal),
-      this.provider.read(descriptorKey, signal),
-      this.provider.read(capacityRowKey, signal)
-    ]);
-    const ownerLive = sameLiveOwner(lease, snapshot);
-    let members: EndedSpotMember[] = [];
-    if (snapshot.allocation.state === 'active') {
-      if (ownerLive) return 'notReclaimable';
-      let unavailable = record.aggregate !== undefined || hasRelocationAuthority(snapshot.payload);
-      if (snapshot.allocation.objectKind !== 'actor') {
-        const spot = decodeServiceReadySpotAuthority(snapshot.payload);
-        unavailable ||=
-          spot === undefined ||
-          spot.kind !== request?.key.kind ||
-          spot.stableType !== request.intent.stableType ||
-          spot.spotId !== request.key.globalId ||
-          spot.activationRecovery !== undefined;
-        if (
-          spot?.kind === 'user_spot' &&
-          !unavailable &&
-          request?.actorRelocationPolicy === 'disabled'
-        )
-          members = await this.readEndedSpotMembers(spot.spotId, snapshot.objectGeneration, signal);
-      }
-      if (unavailable || request?.actorRelocationPolicy !== 'disabled')
-        throw new ZLinkFrameworkException(
-          ZLinkFrameworkErrorKind.Unavailable,
-          'Object owner lease is unavailable.'
-        );
-    } else if (
-      ownerLive &&
-      descriptor.kind === 'found' &&
-      reviveMeshDescriptor(
-        decodeCanonicalDescriptorRecord<ZLinkMeshNodeDescriptor>(descriptor.value.bytes).descriptor
-      ).lifecycleGeneration === snapshot.allocation.descriptorLifecycleGeneration
-    )
-      return 'notReclaimable';
-    if (
-      snapshot.allocation.state !== 'active' &&
-      (record.aggregate !== undefined || hasRelocationAuthority(snapshot.payload))
-    )
-      return 'notReclaimable';
-    // Location runtime §6.1: the authority and every ended-owner member are released in
-    // one conditional batch. Each member is fenced by its row version and the observed
-    // (invalid) state of its own owner lease; member capacity is returned like the Spot's.
-    const conditions: ZLinkStoreCondition[] = [
-      { kind: 'version', key: rowKey, expected: current.value.version },
-      conditionFor(descriptorKey, descriptor)
-    ];
-    const mutations: ZLinkStoreWriteRequest['mutations'][number][] = [
-      { kind: 'delete', key: rowKey }
-    ];
-    const owners = new Map<string, ZLinkStoreReadResult>([[snapshot.ownerId, lease]]);
-    for (const member of members) {
-      let memberLease = owners.get(member.ownerId);
-      if (memberLease === undefined) {
-        memberLease = await this.provider.read(ownerKey(member.ownerId), signal);
-        owners.set(member.ownerId, memberLease);
-      }
+    for (;;) {
+      throwIfOperationExpired(signal, deadlineUnixMs);
+      const rowKey = authorityKey(key.value);
+      const current = await this.provider.read(rowKey, signal);
+      if (current.kind === 'missing') return 'conflict';
+      const record = decodeAuthorityRecord(current.value.bytes);
       if (
-        memberLease.kind === 'found' &&
-        matchesLiveOwnerLease(memberLease, member.ownerId, member.leaseGeneration)
+        current.value.version.value !== expectedStoreVersion &&
+        record.visibleStoreVersion !== expectedStoreVersion
       )
-        throw new ZLinkFrameworkException(
-          ZLinkFrameworkErrorKind.Unavailable,
-          'User Spot still has a member with a live owner lease.'
-        );
-      conditions.push({ kind: 'version', key: member.key, expected: member.version });
-      mutations.push({ kind: 'delete', key: member.key });
-    }
-    for (const [ownerId, read] of owners) conditions.push(conditionFor(ownerKey(ownerId), read));
-    const capacities = new Map<string, { read: ZLinkStoreReadResult; next?: CapacityRecord }>([
-      [capacityRowKey.value, { read: capacity }]
-    ]);
-    const releases: { allocation: StoredAuthoritySnapshot['allocation'] }[] = [
-      { allocation: snapshot.allocation },
-      ...members.map((member) => ({ allocation: member.allocation }))
-    ];
-    try {
-      for (const { allocation } of releases) {
-        const key = capacityKey(allocation.descriptor.meshName, String(allocation.descriptor.rid));
-        let entry = capacities.get(key.value);
-        if (entry === undefined) {
-          entry = { read: await this.provider.read(key, signal) };
-          capacities.set(key.value, entry);
+        return 'conflict';
+      const snapshot = record.snapshot;
+      if (
+        snapshot.allocation.state === 'active'
+          ? request === undefined
+          : snapshot.pendingCreation === undefined
+      )
+        return 'notReclaimable';
+      const leaseKey = ownerKey(snapshot.ownerId);
+      const descriptorKey = meshKey(
+        snapshot.allocation.descriptor.meshName,
+        snapshot.allocation.descriptor.rid
+      );
+      const capacityRowKey = capacityKey(
+        snapshot.allocation.descriptor.meshName,
+        String(snapshot.allocation.descriptor.rid)
+      );
+      const [lease, descriptor, capacity] = await Promise.all([
+        this.provider.read(leaseKey, signal),
+        this.provider.read(descriptorKey, signal),
+        this.provider.read(capacityRowKey, signal)
+      ]);
+      const ownerLive = sameLiveOwner(lease, snapshot);
+      if (
+        requiredOwner !== undefined &&
+        (!ownerLive ||
+          requiredOwner.ownerId !== snapshot.ownerId ||
+          requiredOwner.leaseGeneration !== snapshot.ownerLeaseGeneration)
+      )
+        return 'notReclaimable';
+      let members: EndedSpotMember[] = [];
+      if (snapshot.allocation.state === 'active') {
+        if (ownerLive) return 'notReclaimable';
+        let unavailable =
+          record.aggregate !== undefined || hasRelocationAuthority(snapshot.payload);
+        if (snapshot.allocation.objectKind !== 'actor') {
+          const spot = decodeServiceReadySpotAuthority(snapshot.payload);
+          unavailable ||=
+            spot === undefined ||
+            spot.kind !== request?.key.kind ||
+            spot.stableType !== request.intent.stableType ||
+            spot.spotId !== request.key.globalId ||
+            spot.activationRecovery !== undefined;
+          if (
+            spot?.kind === 'user_spot' &&
+            !unavailable &&
+            request?.actorRelocationPolicy === 'disabled'
+          )
+            members = await this.readEndedSpotMembers(
+              spot.spotId,
+              snapshot.objectGeneration,
+              signal
+            );
         }
-        if (entry.read.kind !== 'found') continue;
-        const stored = entry.next ?? decodeJson<CapacityRecord>(entry.read.value.bytes);
-        entry.next = {
-          active:
-            allocation.state === 'active'
-              ? subtractCapacity(stored.active, allocation.capacity)
-              : stored.active,
-          pending:
-            allocation.state === 'reserved'
-              ? subtractCapacity(stored.pending, allocation.capacity)
-              : stored.pending
-        };
-      }
-    } catch (error) {
+        if (unavailable || request?.actorRelocationPolicy !== 'disabled')
+          throw new ZLinkFrameworkException(
+            ZLinkFrameworkErrorKind.Unavailable,
+            'Object owner lease is unavailable.'
+          );
+      } else if (
+        ownerLive &&
+        descriptor.kind === 'found' &&
+        reviveMeshDescriptor(
+          decodeCanonicalDescriptorRecord<ZLinkMeshNodeDescriptor>(descriptor.value.bytes)
+            .descriptor
+        ).lifecycleGeneration === snapshot.allocation.descriptorLifecycleGeneration
+      )
+        return 'notReclaimable';
       if (
-        !(error instanceof ZLinkFrameworkException) ||
-        error.kind !== ZLinkFrameworkErrorKind.DataLost
+        snapshot.allocation.state !== 'active' &&
+        (record.aggregate !== undefined || hasRelocationAuthority(snapshot.payload))
       )
+        return 'notReclaimable';
+      // Location runtime §6.1: the authority and every ended-owner member are released in
+      // one conditional batch. Each member is fenced by its row version and the observed
+      // (invalid) state of its own owner lease; member capacity is returned like the Spot's.
+      const conditions: ZLinkStoreCondition[] = [
+        { kind: 'version', key: rowKey, expected: current.value.version },
+        conditionFor(descriptorKey, descriptor)
+      ];
+      const mutations: ZLinkStoreWriteRequest['mutations'][number][] = [
+        { kind: 'delete', key: rowKey }
+      ];
+      const owners = new Map<string, ZLinkStoreReadResult>([[snapshot.ownerId, lease]]);
+      for (const member of members) {
+        let memberLease = owners.get(member.ownerId);
+        if (memberLease === undefined) {
+          memberLease = await this.provider.read(ownerKey(member.ownerId), signal);
+          owners.set(member.ownerId, memberLease);
+        }
+        if (
+          memberLease.kind === 'found' &&
+          matchesLiveOwnerLease(memberLease, member.ownerId, member.leaseGeneration)
+        )
+          throw new ZLinkFrameworkException(
+            ZLinkFrameworkErrorKind.Unavailable,
+            'User Spot still has a member with a live owner lease.'
+          );
+        conditions.push({ kind: 'version', key: member.key, expected: member.version });
+        mutations.push({ kind: 'delete', key: member.key });
+      }
+      for (const [ownerId, read] of owners) conditions.push(conditionFor(ownerKey(ownerId), read));
+      const capacities = new Map<string, { read: ZLinkStoreReadResult; next?: CapacityRecord }>([
+        [capacityRowKey.value, { read: capacity }]
+      ]);
+      const releases: { allocation: StoredAuthoritySnapshot['allocation'] }[] = [
+        { allocation: snapshot.allocation },
+        ...members.map((member) => ({ allocation: member.allocation }))
+      ];
+      try {
+        for (const { allocation } of releases) {
+          const key = capacityKey(
+            allocation.descriptor.meshName,
+            String(allocation.descriptor.rid)
+          );
+          let entry = capacities.get(key.value);
+          if (entry === undefined) {
+            entry = { read: await this.provider.read(key, signal) };
+            capacities.set(key.value, entry);
+          }
+          if (entry.read.kind !== 'found') continue;
+          const stored = entry.next ?? decodeJson<CapacityRecord>(entry.read.value.bytes);
+          entry.next = {
+            active:
+              allocation.state === 'active'
+                ? subtractCapacity(stored.active, allocation.capacity)
+                : stored.active,
+            pending:
+              allocation.state === 'reserved'
+                ? subtractCapacity(stored.pending, allocation.capacity)
+                : stored.pending
+          };
+        }
+      } catch (error) {
+        if (
+          !(error instanceof ZLinkFrameworkException) ||
+          error.kind !== ZLinkFrameworkErrorKind.DataLost
+        )
+          throw error;
+        for (const authority of [{ key: rowKey, version: current.value.version }, ...members]) {
+          const observed = await this.provider.read(authority.key, signal);
+          if (
+            observed.kind === 'missing' ||
+            observed.value.version.value !== authority.version.value
+          )
+            return 'conflict';
+        }
         throw error;
-      for (const authority of [{ key: rowKey, version: current.value.version }, ...members]) {
-        const observed = await this.provider.read(authority.key, signal);
-        if (observed.kind === 'missing' || observed.value.version.value !== authority.version.value)
-          return 'conflict';
       }
-      throw error;
-    }
-    for (const [key, entry] of capacities) {
-      conditions.push(conditionFor(storeKey(key), entry.read));
-      if (entry.next !== undefined)
-        mutations.push({
-          kind: 'put',
-          key: storeKey(key),
-          bytes: encodeJson(entry.next satisfies CapacityRecord)
-        });
+      for (const [key, entry] of capacities) {
+        conditions.push(conditionFor(storeKey(key), entry.read));
+        if (entry.next !== undefined)
+          mutations.push({
+            kind: 'put',
+            key: storeKey(key),
+            bytes: encodeJson(entry.next satisfies CapacityRecord)
+          });
+      }
+      // Every mutated key is also a condition key, so the condition count is the batch's
+      // unique key count. A release beyond the provider bound changes nothing.
+      if (conditions.length > ZLINK_PROVIDER_MAX_WRITE_KEYS)
+        throw new ZLinkFrameworkException(
+          ZLinkFrameworkErrorKind.Unavailable,
+          'User Spot member release exceeds one Location Store batch.'
+        );
+      const result = await this.provider.write({ conditions, mutations }, signal);
+      if (result.kind === 'applied') return 'reclaimed';
+      await macrotaskBoundary();
     }
-    // Every mutated key is also a condition key, so the condition count is the batch's
-    // unique key count. A release beyond the provider bound changes nothing.
-    if (conditions.length > ZLINK_PROVIDER_MAX_WRITE_KEYS)
-      throw new ZLinkFrameworkException(
-        ZLinkFrameworkErrorKind.Unavailable,
-        'User Spot member release exceeds one Location Store batch.'
-      );
-    const result = await this.provider.write({ conditions, mutations }, signal);
-    return result.kind === 'applied' ? 'reclaimed' : 'conflict';
   }
 
   /**
@@ -1596,7 +1638,8 @@ export class ZLinkLocationStoreRepository extends ZLinkInMemoryLocationStore {
           encodedAuthorityKey,
           current.value.version.value,
           signal,
-          request
+          request,
+          deadlineUnixMs
         );
         if (reclaim === 'notReclaimable')
           return snapshot.allocation.state === 'active'
@@ -1964,7 +2007,7 @@ export class ZLinkLocationStoreRepository extends ZLinkInMemoryLocationStore {
               request.target.owner
             )
           : [];
-      if (membershipConditions === undefined) return { kind: 'stale' };
+      if (!Array.isArray(membershipConditions)) return { kind: 'stale' };
       const mutations =
         request.completion.kind === 'created'
           ? [
@@ -2818,50 +2861,7 @@ export class ZLinkLocationStoreRepository extends ZLinkInMemoryLocationStore {
     const leaseKey = ownerKey(owner.ownerId);
     const lease = await this.provider.read(leaseKey, signal);
     if (liveOwnerLeaseGeneration(lease) !== owner.leaseGeneration) return 0n;
-    let removed = await this.removeOwnedAuthorities(owner, signal);
-    const candidates: OwnerCleanupCandidate[] = [];
-    for (const prefix of [
-      'mesh-node\0',
-      'client-server\0',
-      'fanout-publisher\0',
-      `${PREFIX}spot:`,
-      `${PREFIX}actor:`,
-      `${PREFIX}route:`
-    ]) {
-      for (;;) {
-        const prefixCandidates: OwnerCleanupCandidate[] = [];
-        let cursor: ZLinkStoreScanCursor | undefined;
-        let expired = false;
-        do {
-          const result = await this.provider.scan({ prefix, cursor, limit: 1_000 }, signal);
-          if (result.kind === 'expired') {
-            expired = true;
-            break;
-          }
-          for (const item of result.value.items) {
-            prefixCandidates.push({ key: item.key, scanVersion: item.value.version });
-          }
-          cursor = result.value.nextCursor;
-        } while (cursor !== undefined);
-        if (expired) {
-          // Snapshot scan expiry invalidates every page from this prefix.
-          // Restart from its first page instead of silently leaving rows
-          // behind after a partial scan.
-          continue;
-        }
-        candidates.push(...prefixCandidates);
-        break;
-      }
-    }
-    for (let offset = 0; offset < candidates.length; offset += MAX_OWNER_CLEANUP_BATCH_ROWS) {
-      removed += await this.removeOwnerCleanupBatch(
-        owner,
-        leaseKey,
-        candidates.slice(offset, offset + MAX_OWNER_CLEANUP_BATCH_ROWS),
-        signal
-      );
-    }
-    return removed + (await super.removeAllByOwner(owner));
+    return this.removeOwnedAuthorities(owner, signal);
   }
 
   private async removeOwnedAuthorities(
@@ -2944,91 +2944,20 @@ export class ZLinkLocationStoreRepository extends ZLinkInMemoryLocationStore {
         signal
       );
       if (aborted.kind === 'aborted') removed += 1n;
-    }
-    return removed;
-  }
-
-  private async removeOwnerCleanupBatch(
-    owner: ZLinkLocationOwnerToken,
-    leaseKey: ZLinkStoreKey,
-    candidates: readonly OwnerCleanupCandidate[],
-    signal?: AbortSignal
-  ): Promise<bigint> {
-    if (candidates.length === 0) return 0n;
-
-    const currentRows = await Promise.all(
-      candidates.map((candidate) => this.provider.read(candidate.key, signal))
-    );
-    const unchangedOwnedRows: OwnerCleanupCandidate[] = [];
-    for (let index = 0; index < candidates.length; index += 1) {
-      const candidate = candidates[index]!;
-      const current = currentRows[index]!;
-      if (
-        current.kind === 'missing' ||
-        current.value.version.value !== candidate.scanVersion.value
-      ) {
-        continue;
-      }
-      const record = decodeJson<OwnerCleanupRecord>(current.value.bytes);
-      const descriptor = record.descriptor;
-      if (
-        descriptor.ownerId !== owner.ownerId ||
-        descriptorOwnerLeaseGeneration(descriptor) !== owner.leaseGeneration
-      ) {
-        continue;
+      else if (aborted.kind === 'stale') {
+        if (
+          await this.releaseEndedReservationRequest(
+            { value: encodedAuthority } as ZLinkAuthorityKey,
+            current.value.version.value,
+            signal,
+            undefined,
+            owner
+          )
+        )
+          removed += 1n;
       }
-      unchangedOwnedRows.push({
-        key: candidate.key,
-        scanVersion: current.value.version
-      });
-    }
-    if (unchangedOwnedRows.length === 0) return 0n;
-
-    const currentLease = await this.provider.read(leaseKey, signal);
-    if (
-      currentLease.kind === 'missing' ||
-      liveOwnerLeaseGeneration(currentLease) !== owner.leaseGeneration
-    ) {
-      return 0n;
     }
-    const result = await this.provider.write(
-      {
-        conditions: [
-          { kind: 'version', key: leaseKey, expected: currentLease.value.version },
-          ...unchangedOwnedRows.map((row) => ({
-            kind: 'version' as const,
-            key: row.key,
-            expected: row.scanVersion
-          }))
-        ],
-        mutations: unchangedOwnedRows.map((row) => ({
-          kind: 'delete' as const,
-          key: row.key
-        }))
-      },
-      signal
-    );
-    if (result.kind === 'applied') return BigInt(unchangedOwnedRows.length);
-
-    // A row may have changed while the page was being prepared. Split the
-    // bounded batch so unaffected rows can still be removed atomically, while
-    // the changed row is discarded by the next version re-read. A changed
-    // owner lease causes every recursive branch to stop at the fence above.
-    if (unchangedOwnedRows.length === 1) return 0n;
-    const midpoint = Math.ceil(unchangedOwnedRows.length / 2);
-    const left = await this.removeOwnerCleanupBatch(
-      owner,
-      leaseKey,
-      unchangedOwnedRows.slice(0, midpoint),
-      signal
-    );
-    const right = await this.removeOwnerCleanupBatch(
-      owner,
-      leaseKey,
-      unchangedOwnedRows.slice(midpoint),
-      signal
-    );
-    return left + right;
+    return removed;
   }
 
   private async updateDescriptor<T extends OwnedDescriptor>(
@@ -3214,10 +3143,16 @@ export class ZLinkLocationStoreRepository extends ZLinkInMemoryLocationStore {
     objectGeneration: bigint,
     signal?: AbortSignal,
     conditionedOwner?: ZLinkLocationOwnerToken
-  ): Promise<ZLinkStoreCondition[] | undefined> {
+  ): Promise<
+    | ZLinkStoreCondition[]
+    | {
+        readonly failureKind:
+          ZLinkFrameworkErrorKind.NotFound | ZLinkFrameworkErrorKind.Unavailable;
+      }
+  > {
     const key = authorityKey(encodeAuthorityKey('user_spot', spotId).value);
     const read = await this.provider.read(key, signal);
-    if (read.kind === 'missing') return undefined;
+    if (read.kind === 'missing') return { failureKind: ZLinkFrameworkErrorKind.NotFound };
     const record = decodeAuthorityRecord(read.value.bytes);
     const snapshot = record.snapshot;
     if (
@@ -3227,10 +3162,11 @@ export class ZLinkLocationStoreRepository extends ZLinkInMemoryLocationStore {
       snapshot.objectGeneration !== objectGeneration ||
       decodeServiceReadySpotAuthority(snapshot.payload)?.kind !== 'user_spot'
     )
-      return undefined;
+      return { failureKind: ZLinkFrameworkErrorKind.Unavailable };
     const leaseKey = ownerKey(snapshot.ownerId);
     const lease = await this.provider.read(leaseKey, signal);
-    if (!sameLiveOwner(lease, snapshot)) return undefined;
+    if (!sameLiveOwner(lease, snapshot))
+      return { failureKind: ZLinkFrameworkErrorKind.Unavailable };
     return [
       { kind: 'version', key, expected: read.value.version },
       ...(conditionedOwner?.ownerId === snapshot.ownerId &&
@@ -3320,7 +3256,7 @@ export class ZLinkLocationStoreRepository extends ZLinkInMemoryLocationStore {
             { ownerId: location.ownerId, leaseGeneration: locationOwnerGeneration(location) }
           )
         : [];
-    if (membershipConditions === undefined) return rejected(lease.value.storeNow);
+    if (!Array.isArray(membershipConditions)) return rejected(lease.value.storeNow);
 
     const result = await this.provider.write(
       {
@@ -3728,7 +3664,6 @@ type OwnedDescriptor =
 
 type LeaseOwnedLocation = ZLinkSpotLocation | ZLinkActorLocation;
 type StoredLocation = LeaseOwnedLocation | ZLinkRouteLocation;
-type OwnedStoreRecord = OwnedDescriptor | StoredLocation;
 
 function validateProviderAggregateRequest(request: ZLinkAggregatePrepareRequest): void {
   requireText(request.aggregateId.value, 'aggregate ID');
@@ -5019,21 +4954,6 @@ function locationOwnerGeneration(value: LeaseOwnedLocation): bigint {
   return value.leaseGeneration;
 }
 
-function descriptorOwnerLeaseGeneration(value: OwnedStoreRecord): bigint | undefined {
-  if ('leaseGeneration' in value) {
-    return typeof value.leaseGeneration === 'bigint'
-      ? value.leaseGeneration
-      : BigInt(value.leaseGeneration);
-  }
-  if ('generation' in value) {
-    return typeof value.generation === 'bigint' ? value.generation : BigInt(value.generation);
-  }
-  return undefined;
-}
-
-// Location runtime §10: a write whose result was lost is confirmed by reading
-// the same key. The stored row already is this write when it differs only in
-// the time the Store stamped, as for every other descriptor kind.
 function sameMeshDescriptor(
   left: ZLinkMeshNodeDescriptor,
   right: ZLinkMeshNodeDescriptor