@zlink-systems/framework 0.30.3 → 0.32.0

package/dist/runtime/locations/location-store-repository.js

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ZLinkLocationStoreRepository = void 0;
+const abort_1 = require("../abort");
 const routing_id_1 = require("../routing-id");
 const service_relocation_runtime_1 = require("../foundation/service-relocation-runtime");
 const service_authority_payload_codec_1 = require("../foundation/service-authority-payload-codec");
@@ -36,7 +37,6 @@ const MAX_GENERATION = 0x7fffffffffffffffn;
 const MAX_U64 = stream_wire_1.UINT64_MAX;
 const CREATION_TERMINAL_RETENTION_MS = 5 * 60 * 1000;
 const MAX_DESCRIPTOR_WRITE_RETRIES = 3;
-const MAX_OWNER_CLEANUP_BATCH_ROWS = 2_047;
 /**
  * Maps framework domain records to the minimal provider SPI.
  *
@@ -215,8 +215,10 @@ class ZLinkLocationStoreRepository extends in_memory_location_store_1.ZLinkInMem
                     ],
                     mutations: [{ kind: 'put', key: rowKey, bytes: encodeAuthorityRecord(nextRecord) }]
                 }, signal);
-                if (result.kind === 'conflict')
+                if (result.kind === 'conflict') {
+                    await (0, abort_1.macrotaskBoundary)();
                     continue;
+                }
                 const storeVersion = result.putVersions.find((entry) => entry.key.value === rowKey.value)?.version;
                 if (storeVersion === undefined) {
                     throw new Error('Authority lease rebind did not return a row version.');
@@ -278,8 +280,12 @@ class ZLinkLocationStoreRepository extends in_memory_location_store_1.ZLinkInMem
                     leaseGeneration: record.snapshot.ownerLeaseGeneration
                 })
                 : [];
-            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: [
                     { kind: 'version', key: rowKey, expected: current.value.version },
@@ -334,8 +340,10 @@ class ZLinkLocationStoreRepository extends in_memory_location_store_1.ZLinkInMem
                             ])
                     ]
             }, signal);
-            if (result.kind === 'conflict')
+            if (result.kind === 'conflict') {
+                await (0, abort_1.macrotaskBoundary)();
                 continue;
+            }
             const storeVersion = result.putVersions.find((entry) => entry.key.value === rowKey.value)?.version;
             if (mutation.kind === 'delete') {
                 return {
@@ -807,7 +815,7 @@ class ZLinkLocationStoreRepository extends in_memory_location_store_1.ZLinkInMem
                 if (membershipConditions.some((condition) => condition.key.value === authorityKey(spotKey.value).value))
                     continue;
                 const conditions = await this.userSpotMembershipConditions(actor.currentSpotId, actor.currentSpotGeneration, signal, aggregate.targetOwner);
-                if (conditions === undefined)
+                if (!Array.isArray(conditions))
                     return { kind: 'stale' };
                 membershipConditions.push(...conditions.filter((condition) => !membershipConditions.some((existing) => existing.key.value === condition.key.value)));
             }
@@ -915,137 +923,151 @@ class ZLinkLocationStoreRepository extends in_memory_location_store_1.ZLinkInMem
     async releaseEndedReservation(key, expectedStoreVersion, signal, request) {
         return this.observeStore('release', () => this.releaseEndedReservationRequest(key, expectedStoreVersion, signal, request));
     }
-    async releaseEndedReservationRequest(key, expectedStoreVersion, signal, request) {
-        return ((await this.tryReleaseEndedReservation(key, expectedStoreVersion, signal, request)) ===
-            'reclaimed');
+    async releaseEndedReservationRequest(key, expectedStoreVersion, signal, request, requiredOwner) {
+        return ((await this.tryReleaseEndedReservation(key, expectedStoreVersion, signal, request, undefined, requiredOwner)) === 'reclaimed');
     }
-    async tryReleaseEndedReservation(key, expectedStoreVersion, signal, request) {
-        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 = [];
-        if (snapshot.allocation.state === 'active') {
-            if (ownerLive)
+    async tryReleaseEndedReservation(key, expectedStoreVersion, signal, request, deadlineUnixMs, requiredOwner) {
+        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 (current.value.version.value !== expectedStoreVersion &&
+                record.visibleStoreVersion !== expectedStoreVersion)
+                return 'conflict';
+            const snapshot = record.snapshot;
+            if (snapshot.allocation.state === 'active'
+                ? request === undefined
+                : snapshot.pendingCreation === undefined)
                 return 'notReclaimable';
-            let unavailable = record.aggregate !== undefined || hasRelocationAuthority(snapshot.payload);
-            if (snapshot.allocation.objectKind !== 'actor') {
-                const spot = (0, service_authority_payload_codec_1.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 contracts_2.ZLinkFrameworkException(contracts_2.ZLinkFrameworkErrorKind.Unavailable, 'Object owner lease is unavailable.');
-        }
-        else if (ownerLive &&
-            descriptor.kind === 'found' &&
-            reviveMeshDescriptor(decodeCanonicalDescriptorRecord(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 = [
-            { kind: 'version', key: rowKey, expected: current.value.version },
-            conditionFor(descriptorKey, descriptor)
-        ];
-        const mutations = [
-            { kind: 'delete', key: rowKey }
-        ];
-        const owners = new Map([[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 contracts_2.ZLinkFrameworkException(contracts_2.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([
-            [capacityRowKey.value, { read: capacity }]
-        ]);
-        const releases = [
-            { 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);
+            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 = [];
+            if (snapshot.allocation.state === 'active') {
+                if (ownerLive)
+                    return 'notReclaimable';
+                let unavailable = record.aggregate !== undefined || hasRelocationAuthority(snapshot.payload);
+                if (snapshot.allocation.objectKind !== 'actor') {
+                    const spot = (0, service_authority_payload_codec_1.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(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
-                };
+                if (unavailable || request?.actorRelocationPolicy !== 'disabled')
+                    throw new contracts_2.ZLinkFrameworkException(contracts_2.ZLinkFrameworkErrorKind.Unavailable, 'Object owner lease is unavailable.');
             }
-        }
-        catch (error) {
-            if (!(error instanceof contracts_2.ZLinkFrameworkException) ||
-                error.kind !== contracts_2.ZLinkFrameworkErrorKind.DataLost)
+            else if (ownerLive &&
+                descriptor.kind === 'found' &&
+                reviveMeshDescriptor(decodeCanonicalDescriptorRecord(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 = [
+                { kind: 'version', key: rowKey, expected: current.value.version },
+                conditionFor(descriptorKey, descriptor)
+            ];
+            const mutations = [
+                { kind: 'delete', key: rowKey }
+            ];
+            const owners = new Map([[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 contracts_2.ZLinkFrameworkException(contracts_2.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([
+                [capacityRowKey.value, { read: capacity }]
+            ]);
+            const releases = [
+                { 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(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 contracts_2.ZLinkFrameworkException) ||
+                    error.kind !== contracts_2.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((0, in_memory_provider_location_store_1.storeKey)(key), entry.read));
-            if (entry.next !== undefined)
-                mutations.push({
-                    kind: 'put',
-                    key: (0, in_memory_provider_location_store_1.storeKey)(key),
-                    bytes: encodeJson(entry.next)
-                });
+            for (const [key, entry] of capacities) {
+                conditions.push(conditionFor((0, in_memory_provider_location_store_1.storeKey)(key), entry.read));
+                if (entry.next !== undefined)
+                    mutations.push({
+                        kind: 'put',
+                        key: (0, in_memory_provider_location_store_1.storeKey)(key),
+                        bytes: encodeJson(entry.next)
+                    });
+            }
+            // 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 > Stores_1.ZLINK_PROVIDER_MAX_WRITE_KEYS)
+                throw new contracts_2.ZLinkFrameworkException(contracts_2.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 (0, abort_1.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 > Stores_1.ZLINK_PROVIDER_MAX_WRITE_KEYS)
-            throw new contracts_2.ZLinkFrameworkException(contracts_2.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';
     }
     /**
      * Reads every Actor membership of one User Spot incarnation from complete snapshot scans
@@ -1116,7 +1138,7 @@ class ZLinkLocationStoreRepository extends in_memory_location_store_1.ZLinkInMem
                 }
                 if (reclaimVersion !== undefined && snapshot.storeVersion.value !== reclaimVersion)
                     return { kind: 'conflict', current: snapshot };
-                const reclaim = await this.tryReleaseEndedReservation(encodedAuthorityKey, current.value.version.value, signal, request);
+                const reclaim = await this.tryReleaseEndedReservation(encodedAuthorityKey, current.value.version.value, signal, request, deadlineUnixMs);
                 if (reclaim === 'notReclaimable')
                     return snapshot.allocation.state === 'active'
                         ? { kind: 'alreadyExists', current: snapshot }
@@ -1417,7 +1439,7 @@ class ZLinkLocationStoreRepository extends in_memory_location_store_1.ZLinkInMem
             const membershipConditions = actor?.currentSpotKind === contracts_1.ZLinkSpotKind.User
                 ? await this.userSpotMembershipConditions(actor.currentSpotId, actor.currentSpotGeneration, signal, request.target.owner)
                 : [];
-            if (membershipConditions === undefined)
+            if (!Array.isArray(membershipConditions))
                 return { kind: 'stale' };
             const mutations = request.completion.kind === 'created'
                 ? [
@@ -1889,45 +1911,7 @@ class ZLinkLocationStoreRepository extends in_memory_location_store_1.ZLinkInMem
         const lease = await this.provider.read(leaseKey, signal);
         if (liveOwnerLeaseGeneration(lease) !== owner.leaseGeneration)
             return 0n;
-        let removed = await this.removeOwnedAuthorities(owner, signal);
-        const candidates = [];
-        for (const prefix of [
-            'mesh-node\0',
-            'client-server\0',
-            'fanout-publisher\0',
-            `${PREFIX}spot:`,
-            `${PREFIX}actor:`,
-            `${PREFIX}route:`
-        ]) {
-            for (;;) {
-                const prefixCandidates = [];
-                let cursor;
-                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);
     }
     async removeOwnedAuthorities(owner, signal) {
         const candidates = [];
@@ -1995,65 +1979,12 @@ class ZLinkLocationStoreRepository extends in_memory_location_store_1.ZLinkInMem
             }, signal);
             if (aborted.kind === 'aborted')
                 removed += 1n;
-        }
-        return removed;
-    }
-    async removeOwnerCleanupBatch(owner, leaseKey, candidates, signal) {
-        if (candidates.length === 0)
-            return 0n;
-        const currentRows = await Promise.all(candidates.map((candidate) => this.provider.read(candidate.key, signal)));
-        const unchangedOwnedRows = [];
-        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(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 }, 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',
-                    key: row.key,
-                    expected: row.scanVersion
-                }))
-            ],
-            mutations: unchangedOwnedRows.map((row) => ({
-                kind: 'delete',
-                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;
     }
     async updateDescriptor(rowKey, descriptor, intent, revive, same, canRenew, signal) {
         const leaseKey = ownerKey(descriptor.ownerId);
@@ -2171,7 +2102,7 @@ class ZLinkLocationStoreRepository extends in_memory_location_store_1.ZLinkInMem
         const key = authorityKey((0, authority_key_codec_1.encodeAuthorityKey)('user_spot', spotId).value);
         const read = await this.provider.read(key, signal);
         if (read.kind === 'missing')
-            return undefined;
+            return { failureKind: contracts_2.ZLinkFrameworkErrorKind.NotFound };
         const record = decodeAuthorityRecord(read.value.bytes);
         const snapshot = record.snapshot;
         if (record.aggregate !== undefined ||
@@ -2179,11 +2110,11 @@ class ZLinkLocationStoreRepository extends in_memory_location_store_1.ZLinkInMem
             snapshot.allocation.state !== 'active' ||
             snapshot.objectGeneration !== objectGeneration ||
             (0, service_authority_payload_codec_1.decodeServiceReadySpotAuthority)(snapshot.payload)?.kind !== 'user_spot')
-            return undefined;
+            return { failureKind: contracts_2.ZLinkFrameworkErrorKind.Unavailable };
         const leaseKey = ownerKey(snapshot.ownerId);
         const lease = await this.provider.read(leaseKey, signal);
         if (!sameLiveOwner(lease, snapshot))
-            return undefined;
+            return { failureKind: contracts_2.ZLinkFrameworkErrorKind.Unavailable };
         return [
             { kind: 'version', key, expected: read.value.version },
             ...(conditionedOwner?.ownerId === snapshot.ownerId &&
@@ -2251,7 +2182,7 @@ class ZLinkLocationStoreRepository extends in_memory_location_store_1.ZLinkInMem
                 BigInt(previousMembership.spotGeneration) !== membership.spotGeneration)
             ? await this.userSpotMembershipConditions(String(membership.spotId), membership.spotGeneration, signal, { ownerId: location.ownerId, leaseGeneration: locationOwnerGeneration(location) })
             : [];
-        if (membershipConditions === undefined)
+        if (!Array.isArray(membershipConditions))
             return rejected(lease.value.storeNow);
         const result = await this.provider.write({
             conditions: [
@@ -3527,20 +3458,6 @@ function matchesRoute(value, filter) {
 function locationOwnerGeneration(value) {
     return value.leaseGeneration;
 }
-function descriptorOwnerLeaseGeneration(value) {
-    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, right) {
     return descriptorFingerprint(left, ['updatedAt']) === descriptorFingerprint(right, ['updatedAt']);
 }

package/dist/runtime/locations/resolvers.d.ts

@@ -1,3 +1,5 @@
+import type { PendingOperation } from '../foundation/operation-registry';
+import { inspectRuntime } from '../internal-observation';
 import type { ActorRef, RoutingId, SpotId } from '../../contracts/Common';
 import { type SpotHandle, type ZLinkActorSpotHandleResolver, type ZLinkSpotHandleResolver, type ResolvedSpotHandle } from '../spots/spot-handle';
 import type { ZLinkSpotRouteResolver, ZLinkSpotRouteTarget, ZLinkInstanceReactivationRoute } from '../spots/spot-routing-internal';
@@ -67,6 +69,11 @@ export interface ZLinkSpotRouteInvalidationFence {
 }
 export declare class ZLinkStoreLocationResolvers implements ZLinkPeerLocationResolver, ZLinkSpotHandleResolver, ZLinkActorSpotHandleResolver {
     private readonly options;
+    [inspectRuntime](): Readonly<{
+        spotRouteKeys: readonly string[];
+        actorRouteKeys: readonly string[];
+        directActorRouteKeys: readonly string[];
+    }>;
     private readonly lane;
     private readonly liveRows;
     private readonly monotonicNowMs;
@@ -91,7 +98,7 @@ export declare class ZLinkStoreLocationResolvers implements ZLinkPeerLocationRes
     resolveSpotHandle(meshName: string, spotId: RoutingId, signal?: AbortSignal): Promise<SpotHandle | undefined>;
     resolveActorSpotRef(meshName: string, actorId: string, signal?: AbortSignal): Promise<ResolvedSpotHandle | undefined>;
     resolveActorRef(actorId: string, signal?: AbortSignal): Promise<ActorRef | undefined>;
-    resolveDirectActorRoute(actorId: string, signal?: AbortSignal, deadlineMs?: number): Promise<ZLinkDirectActorRouteResolution>;
+    resolveDirectActorRoute(actorId: string, signal?: AbortSignal, deadlineMs?: number, requestOperation?: PendingOperation<unknown>): Promise<ZLinkDirectActorRouteResolution>;
     private resolveUncachedDirectActorRoute;
     private cacheDirectActorRoute;
     observeActorAuthorityVersion(actorId: string, storeVersion: string): void;

package/dist/runtime/locations/resolvers.js

@@ -1,6 +1,8 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ZLinkAuthoritySpotRouteResolver = exports.ZLinkLocationSpotRouteResolver = exports.DefaultZLinkLocationReadiness = exports.ZLinkStoreLocationResolvers = void 0;
+const abort_1 = require("../abort");
+const internal_observation_1 = require("../internal-observation");
 const location_store_pages_1 = require("./location-store-pages");
 const Errors_1 = require("../../contracts/Errors");
 const Options_1 = require("../../contracts/Locations/Options");
@@ -54,6 +56,13 @@ function projectCanonicalActorRoute(snapshot, actorId) {
 }
 class ZLinkStoreLocationResolvers {
     options;
+    [internal_observation_1.inspectRuntime]() {
+        return Object.freeze({
+            spotRouteKeys: Object.freeze([...this.spotRoutes.keys()]),
+            actorRouteKeys: Object.freeze([...this.actorRoutes.keys()]),
+            directActorRouteKeys: Object.freeze([...this.directActorRoutes.keys()])
+        });
+    }
     lane = new state_lane_1.ZLinkStateLane();
     liveRows;
     monotonicNowMs;
@@ -195,11 +204,16 @@ class ZLinkStoreLocationResolvers {
         }
         return (await this.resolveActorRow({ meshName: '', actorId }, signal))?.actorRef;
     }
-    async resolveDirectActorRoute(actorId, signal, deadlineMs) {
+    async resolveDirectActorRoute(actorId, signal, deadlineMs, requestOperation) {
         const cached = await this.lane.run(() => this.getCachedCore(this.directActorRoutes, actorId));
         if (cached !== undefined)
             return { kind: 'ready', route: cached };
-        return await (0, actor_request_deadline_1.waitActorReply)(this.resolveUncachedDirectActorRoute(actorId, signal), actorId, deadlineMs, signal);
+        const resolving = this.resolveUncachedDirectActorRoute(actorId, signal);
+        if (requestOperation === undefined) {
+            (0, actor_request_deadline_1.remainingActorRequestTimeout)(actorId, deadlineMs);
+            return await (0, abort_1.awaitWithAbort)(resolving, signal);
+        }
+        return await resolving;
     }
     async resolveUncachedDirectActorRoute(actorId, signal) {
         const current = await this.options.stores.authorityStore.readAuthority((0, authority_key_codec_1.encodeAuthorityKey)('actor', actorId), signal);

package/dist/runtime/locations/runtime.d.ts

@@ -1,6 +1,6 @@
 import { type ZLinkLocationOptionOverrides } from '../../contracts/Locations/Options';
 import type { RoutingId } from '../../contracts/Common';
-import { ZLinkLocationAutoConnectType, ZLinkLocationWriteIntent, ZLinkLocationWriteStatus, type ZLinkLocationRuntimeQuery, type ZLinkLocationOwnerToken, type ZLinkOwnerLeaseRenewed, type ZLinkActorLocation, type ZLinkActorLocationFilter, type ZLinkActorLocationKey, type ZLinkLocationKey, type ZLinkLocationPage, type ZLinkLocationRuntimeStatus, type ZLinkLocationServiceSummary, type ZLinkLocationServiceSummaryFilter, type ZLinkMeshNodeDescriptor, type ZLinkLocationTopologyEntry, type ZLinkLocationTopologyFilter, type ZLinkLocationWriteResult, type ZLinkPageRequest, type ZLinkPeerLocation, type ZLinkPeerLocationFilter, type ZLinkPeerLocationKey, type ZLinkRouteLocation, type ZLinkRouteLocationFilter, type ZLinkRouteLocationKey, type ZLinkSpotLocation, type ZLinkSpotLocationFilter, type ZLinkSpotLocationKey } from './internal-location-contracts';
+import { ZLinkLocationAutoConnectType, ZLinkLocationKind, ZLinkLocationWriteIntent, ZLinkLocationWriteStatus, type ZLinkLocationRuntimeQuery, type ZLinkLocationOwnerToken, type ZLinkOwnerLeaseRenewed, type ZLinkActorLocation, type ZLinkActorLocationFilter, type ZLinkActorLocationKey, type ZLinkLocationKey, type ZLinkLocationPage, type ZLinkLocationRuntimeStatus, type ZLinkLocationServiceSummary, type ZLinkLocationServiceSummaryFilter, type ZLinkMeshNodeDescriptor, type ZLinkLocationTopologyEntry, type ZLinkLocationTopologyFilter, type ZLinkLocationWriteResult, type ZLinkPageRequest, type ZLinkPeerLocation, type ZLinkPeerLocationFilter, type ZLinkPeerLocationKey, type ZLinkRouteLocation, type ZLinkRouteLocationFilter, type ZLinkRouteLocationKey, type ZLinkSpotLocation, type ZLinkSpotLocationFilter, type ZLinkSpotLocationKey } from './internal-location-contracts';
 import type { ZLinkLocationObjectEntry, ZLinkLocationObjectFilter } from '../../contracts/Locations/RuntimeQuery';
 import type { ZLinkActorLocationStore, ZLinkAuthorityStore, ZLinkClientServerLocationStore, ZLinkFanoutLocationStore, ZLinkOwnerLeaseStore, ZLinkPeerLocationStore, ZLinkRouteLocationStore, ZLinkSpotLocationStore } from './internal-store-contracts';
 import type { ZLinkDomainLocationStore } from './domain-store-contract';
@@ -95,7 +95,7 @@ export declare class ZLinkLocationRuntime implements ZLinkLocationRuntimeQuery {
     get isStarted(): boolean;
     get nodeRid(): RoutingId | undefined;
     get currentOwnerToken(): ZLinkLocationOwnerToken | undefined;
-    /** Location runtime §5: a startup Store request ends within the renew timeout. */
+    /** Location runtime §5: a descriptor publication ends within the renew timeout. */
     writeDescriptor<T>(action: (signal?: AbortSignal) => Promise<T>, signal?: AbortSignal): Promise<T>;
     closeOwnerLeaseAdmission(error: unknown): void;
     reclaimOwnerAuthorities(signal?: AbortSignal): Promise<void>;
@@ -149,7 +149,7 @@ export declare class ZLinkLocationRuntime implements ZLinkLocationRuntimeQuery {
     private scheduleHeartbeat;
     private guardWrite;
     private guardStatusWrite;
-    private notifyIfStale;
+    notifyIfStale(result: ZLinkLocationWriteResult, kind: ZLinkLocationKind, key: string): void;
     private notifyIfStaleStatus;
     private recordFailure;
     private recordOwnerLeaseRenewFailure;