@zlink-systems/framework 0.31.0 → 0.32.0

package/dist/runtime/locations/auto-connect-loop.js

@@ -2,9 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ZLinkAutoConnectLoop = void 0;
 const Options_1 = require("../../contracts/Locations/Options");
-const state_lane_1 = require("../execution/state-lane");
 class ZLinkAutoConnectLoop {
-    lane = new state_lane_1.ZLinkStateLane();
     reconciler;
     options;
     meshName;
@@ -29,18 +27,21 @@ class ZLinkAutoConnectLoop {
         this.clearTimer = options.clearTimer ?? ((handle) => clearTimeout(handle));
     }
     async start(signal) {
-        if (await this.lane.run(() => this.controller !== undefined))
+        if (this.controller !== undefined)
             return;
-        await this.tick(signal);
-        const started = await this.lane.run(() => {
-            if (this.controller !== undefined)
-                return false;
-            this.controller = new AbortController();
-            return true;
-        });
-        if (!started)
-            return;
-        this.scheduleNext();
+        // Reserve the lifecycle before yielding so stop also owns the first publication.
+        const controller = new AbortController();
+        this.controller = controller;
+        try {
+            await this.tick(signal);
+        }
+        catch (error) {
+            if (this.controller === controller) {
+                await this.prepareTransportShutdown();
+            }
+            throw error;
+        }
+        this.scheduleNext(controller);
     }
     async requestPeerReconcile(meshName, _peerRid) {
         const controller = this.controller;
@@ -74,9 +75,14 @@ class ZLinkAutoConnectLoop {
     }
     async tick(signal) {
         const controller = this.controller;
+        const tickSignal = controller === undefined
+            ? signal
+            : signal === undefined
+                ? controller.signal
+                : AbortSignal.any([signal, controller.signal]);
         await this.enqueueTick(async () => {
-            if (controller?.signal.aborted !== true)
-                await this.tickCore(signal ?? controller?.signal);
+            if (tickSignal?.aborted !== true)
+                await this.tickCore(tickSignal);
         });
     }
     enqueueTick(operation) {
@@ -118,15 +124,15 @@ class ZLinkAutoConnectLoop {
         this.lastTickFailed = this.reconciler.storeFailed;
         return this.lastTickFailed;
     }
-    scheduleNext() {
-        if (this.controller === undefined || this.controller.signal.aborted) {
+    scheduleNext(controller) {
+        if (this.controller !== controller || controller.signal.aborted) {
             return;
         }
         this.timer = this.setTimer(() => {
             this.timer = undefined;
-            void this.tick(this.controller?.signal)
+            void this.tick(controller.signal)
                 .catch(() => undefined)
-                .finally(() => this.scheduleNext());
+                .finally(() => this.scheduleNext(controller));
         }, this.options.pollingIntervalMs);
     }
 }

package/dist/runtime/locations/auto-connect-planner.js

@@ -94,12 +94,9 @@ function targetOf(peer) {
     };
 }
 function isAutoConnectSelf(local, peer) {
-    if (local.nodeRid !== undefined &&
+    return (local.nodeRid !== undefined &&
         peer.nodeRid !== undefined &&
-        (0, routing_id_1.routingIdsEqual)(local.nodeRid, peer.nodeRid)) {
-        return true;
-    }
-    return peer.endpoint === local.endpoint;
+        (0, routing_id_1.routingIdsEqual)(local.nodeRid, peer.nodeRid));
 }
 function shouldDialAutoConnectPeer(local, peer) {
     switch (local.autoConnectType) {

package/dist/runtime/locations/auto-connect-reconciler.d.ts

@@ -47,6 +47,7 @@ export declare class ZLinkAutoConnectReconciler {
     disconnectPeers(): void;
     unpublishLocal(signal?: AbortSignal): Promise<void>;
     private disconnectIfNeeded;
+    private publishLocalForTick;
     private publishLocal;
     private prepareUnpublishLocalCore;
     private preparePublishLocalCore;

package/dist/runtime/locations/auto-connect-reconciler.js

@@ -66,13 +66,8 @@ class ZLinkAutoConnectReconciler {
         return this.meshMemberRidHexes.has(encodeRoutingIdHex(nodeRid));
     }
     async tick(signal) {
-        try {
-            await this.publishLocal(signal);
-        }
-        catch {
-            await this.recordStoreFailure();
+        if (!(await this.publishLocalForTick(signal)))
             return;
-        }
         if (!this.reconcilePeers) {
             await this.lane.run(() => {
                 this.storeFailedValue = false;
@@ -86,9 +81,10 @@ class ZLinkAutoConnectReconciler {
                 autoConnectType: this.local.autoConnectType,
                 meshName: this.local.meshName
             }, signal);
+            signal?.throwIfAborted();
         }
         catch {
-            await this.recordStoreFailure();
+            await this.recordStoreFailure(signal);
             return;
         }
         // A restarted Store can accept commands and return an empty live set
@@ -103,17 +99,8 @@ class ZLinkAutoConnectReconciler {
             await this.lane.run(() => {
                 this.localPublished = false;
             });
-            try {
-                const republished = await this.publishLocal(signal);
-                if (!republished) {
-                    await this.recordStoreFailure();
-                    return;
-                }
-            }
-            catch {
-                await this.recordStoreFailure();
+            if (!(await this.publishLocalForTick(signal)))
                 return;
-            }
         }
         if (await this.lane.run(() => this.storeFailedValue)) {
             await this.lane.run(() => {
@@ -267,21 +254,46 @@ class ZLinkAutoConnectReconciler {
             return;
         this.executor.disconnect(target);
     }
+    async publishLocalForTick(signal) {
+        let published;
+        try {
+            published = await this.publishLocal(signal);
+            signal?.throwIfAborted();
+        }
+        catch {
+            await this.recordStoreFailure(signal);
+            return false;
+        }
+        if (!published) {
+            await this.recordStoreFailure(signal);
+            return false;
+        }
+        return true;
+    }
     async publishLocal(signal) {
+        signal?.throwIfAborted();
         const prepared = await this.lane.run(() => this.preparePublishLocalCore());
-        if (prepared === undefined)
-            return await this.lane.run(() => this.localPublished);
+        if (prepared === undefined) {
+            return this.localRow === undefined || (await this.lane.run(() => this.localPublished));
+        }
         const claimed = await this.runtime.writePeer(prepared.row, internal_location_contracts_1.ZLinkLocationWriteIntent.NewClaim, signal);
         if (claimed.status === internal_location_contracts_1.ZLinkLocationWriteStatus.Stored) {
-            return await this.lane.run(() => this.completePublishClaimCore(claimed.generation));
+            return await this.lane.run(() => {
+                signal?.throwIfAborted();
+                return this.completePublishClaimCore(claimed.generation);
+            });
         }
-        const renewal = await this.lane.run(() => this.preparePublishRenewalCore(prepared.row, claimed.status));
+        const renewal = await this.lane.run(() => {
+            signal?.throwIfAborted();
+            return this.preparePublishRenewalCore(prepared.row, claimed.status);
+        });
         if (renewal !== undefined) {
             const renewed = await this.runtime.writePeer({
                 ...prepared.row,
                 generation: renewal
             }, internal_location_contracts_1.ZLinkLocationWriteIntent.Renew, signal);
             return await this.lane.run(() => {
+                signal?.throwIfAborted();
                 this.localPublished = renewed.status === internal_location_contracts_1.ZLinkLocationWriteStatus.Stored;
                 return this.localPublished;
             });
@@ -317,8 +329,8 @@ class ZLinkAutoConnectReconciler {
             ? this.localGeneration
             : undefined;
     }
-    async recordStoreFailure() {
-        const retryTargets = await this.lane.run(() => this.beginStoreFailureCore());
+    async recordStoreFailure(signal) {
+        const retryTargets = await this.lane.run(() => signal?.aborted === true ? undefined : this.beginStoreFailureCore());
         if (retryTargets === undefined)
             return;
         for (const [key, target] of retryTargets) {

package/dist/runtime/locations/in-memory-location-store.d.ts

@@ -71,9 +71,7 @@ export declare class ZLinkInMemoryLocationStore implements ZLinkDomainLocationSt
     private write;
     private transitionActorTransfer;
     private remove;
-    private removeByOwner;
     private liveOwnerLease;
     private bump;
-    private removeFanoutByOwner;
     private bumpScope;
 }

package/dist/runtime/locations/in-memory-location-store.js

@@ -596,23 +596,7 @@ class ZLinkInMemoryLocationStore {
             lease.leaseExpiresAt.getTime() <= this.now().getTime()) {
             return 0n;
         }
-        const ownerId = owner.ownerId;
-        let removed = Number(await this.authority.removeAllByOwner(owner, signal));
-        for (const [key, row] of [...this.meshNodes.rows]) {
-            if (row.ownerId !== owner.ownerId)
-                continue;
-            this.meshNodes.rows.delete(key);
-            this.releaseEntrySpotIdentity(row);
-            this.bump(internal_location_contracts_1.ZLinkLocationKind.Peer, row.meshName);
-            removed++;
-        }
-        removed += this.removeByOwner(this.peers, ownerId, (row) => row.ownerId, internal_location_contracts_1.ZLinkLocationKind.Peer, (row) => row.meshName);
-        removed += this.removeByOwner(this.spots, ownerId, (row) => row.ownerId, internal_location_contracts_1.ZLinkLocationKind.Spot, (row) => row.meshName);
-        removed += this.removeByOwner(this.actors, ownerId, (row) => row.ownerId, internal_location_contracts_1.ZLinkLocationKind.Actor, () => undefined);
-        removed += this.removeByOwner(this.routes, ownerId, (row) => row.ownerId, internal_location_contracts_1.ZLinkLocationKind.Route, () => undefined);
-        removed += this.removeByOwner(this.clientServers, ownerId, (row) => row.ownerId, internal_location_contracts_1.ZLinkLocationKind.ClientServer, (row) => row.channelName);
-        removed += this.removeFanoutByOwner(owner);
-        return BigInt(removed);
+        return this.authority.removeAllByOwner(owner, signal);
     }
     claimEntrySpotIdentity(descriptor, descriptorKey) {
         if (descriptor.entrySpotId === undefined)
@@ -710,17 +694,6 @@ class ZLinkInMemoryLocationStore {
         this.bump(kind, meshName);
         return stored(owner.leaseGeneration, this.now());
     }
-    removeByOwner(table, ownerId, ownerOf, kind, meshOf) {
-        let removed = 0;
-        for (const [key, row] of [...table.rows.entries()]) {
-            if (ownerOf(row) === ownerId) {
-                table.rows.delete(key);
-                this.bump(kind, meshOf(row));
-                removed++;
-            }
-        }
-        return removed;
-    }
     liveOwnerLease(ownerId, now) {
         const lease = this.leases.get(ownerId);
         return lease !== undefined && lease.leaseExpiresAt.getTime() > now.getTime()
@@ -733,16 +706,6 @@ class ZLinkInMemoryLocationStore {
             this.bumpScope({ kind });
         }
     }
-    removeFanoutByOwner(owner) {
-        let removed = 0;
-        for (const [key, row] of this.fanoutPublishers.rows) {
-            if (row.ownerId !== owner.ownerId)
-                continue;
-            this.fanoutPublishers.rows.delete(key);
-            removed++;
-        }
-        return removed;
-    }
     bumpScope(scope) {
         const key = stampKey(scope);
         this.stamps.set(key, (this.stamps.get(key) ?? 0n) + 1n);

package/dist/runtime/locations/location-store-repository.d.ts

@@ -104,7 +104,6 @@ export declare class ZLinkLocationStoreRepository extends ZLinkInMemoryLocationS
     removeAllByOwner(owner: ZLinkLocationOwnerToken, signal?: AbortSignal): Promise<bigint>;
     private removeAllByOwnerRequest;
     private removeOwnedAuthorities;
-    private removeOwnerCleanupBatch;
     private updateDescriptor;
     private writeDescriptorWithReconciliation;
     private removeDescriptor;

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

@@ -37,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.
  *
@@ -924,11 +923,10 @@ 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, deadlineUnixMs) {
+    async tryReleaseEndedReservation(key, expectedStoreVersion, signal, request, deadlineUnixMs, requiredOwner) {
         for (;;) {
             throwIfOperationExpired(signal, deadlineUnixMs);
             const rowKey = authorityKey(key.value);
@@ -953,6 +951,11 @@ class ZLinkLocationStoreRepository extends in_memory_location_store_1.ZLinkInMem
                 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)
@@ -1908,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 = [];
@@ -2014,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);
@@ -3546,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/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;

package/dist/runtime/locations/runtime.js

@@ -99,7 +99,7 @@ class ZLinkLocationRuntime {
     get currentOwnerToken() {
         return this.ownerToken;
     }
-    /** Location runtime §5: a startup Store request ends within the renew timeout. */
+    /** Location runtime §5: a descriptor publication ends within the renew timeout. */
     async writeDescriptor(action, signal) {
         try {
             return await withTimeout(action, this.options.ownerLeaseRenewTimeoutMs, signal);
@@ -226,7 +226,7 @@ class ZLinkLocationRuntime {
     async cleanupOwner(signal) {
         const pending = this.heartbeatRenewal;
         try {
-            await withTimeout(() => pending ?? Promise.resolve(), undefined, signal);
+            await (pending ?? Promise.resolve());
         }
         catch (error) {
             if (!(0, abort_1.isAbortError)(error))
@@ -240,18 +240,14 @@ class ZLinkLocationRuntime {
             return;
         }
         try {
-            const owner = this.ownerToken ??
-                this.lastOwnerToken ?? {
-                ownerId: this.ownerId,
-                leaseGeneration: 0n
-            };
-            await withTimeout(async (cleanupSignal) => {
-                await this.stores.locationStore.removeAllByOwner(owner, cleanupSignal);
-                const currentLease = await this.stores.ownerLeaseStore.readOwnerLease(this.ownerId, cleanupSignal);
-                if (currentLease.kind === 'found') {
-                    await this.stores.ownerLeaseStore.releaseOwnerLease(currentLease.token, cleanupSignal);
-                }
-            }, undefined, signal);
+            const owner = this.ownerToken ?? this.lastOwnerToken;
+            signal?.throwIfAborted();
+            if (owner !== undefined) {
+                await this.stores.locationStore.removeAllByOwner(owner, signal);
+                signal?.throwIfAborted();
+                await this.stores.ownerLeaseStore.releaseOwnerLease(owner, signal);
+                signal?.throwIfAborted();
+            }
             this.ownerToken = undefined;
             this.lastOwnerToken = undefined;
             this.ownerCleanupComplete = true;
@@ -334,7 +330,7 @@ class ZLinkLocationRuntime {
         }
         try {
             if (!this.started) {
-                // stop owns confirmation and release under the host shutdown signal.
+                this.lastOwnerToken = claim.token;
                 return false;
             }
             this.lastOwnerToken = this.ownerToken;
@@ -500,7 +496,7 @@ class ZLinkLocationRuntime {
         // row was stored under.
         const normalizedEndpoint = (0, EndpointNotation_1.normalizeEndpoint)(peer.endpoint);
         const stamped = { ...peer, endpoint: normalizedEndpoint, ownerId: this.ownerId };
-        const result = await this.guardWrite(() => this.stores.peerStore.updatePeer(stamped, intent, signal));
+        const result = await this.guardWrite(() => this.writeDescriptor((writeSignal) => this.stores.peerStore.updatePeer(stamped, intent, writeSignal), signal));
         const key = {
             autoConnectType: peer.autoConnectType,
             meshName: peer.meshName,

package/dist/runtime/messaging/creation-payload-codec.js

@@ -10,7 +10,7 @@ const CREATION_PACKET_NAME = 'ZLinkFrameworkCreationRequest';
 function encodeFrameworkCreationPayload(payload, registry) {
     const message = (0, payload_codec_1.encodeFrameworkPayloadMessage)(payload ?? null, registry);
     try {
-        return (0, service_wire_m6a_codec_1.encodeApplicationPayload)({
+        return (0, service_wire_m6a_codec_1.encodeOwnedApplicationPayload)({
             packetName: CREATION_PACKET_NAME,
             contentType: (0, payload_codec_1.frameworkPayloadContentType)(message),
             payload: message.data()
@@ -26,7 +26,7 @@ function decodeFrameworkCreationPayload(payload, registry) {
         if (application.packetName !== CREATION_PACKET_NAME) {
             throw new RangeError('Creation payload has an unexpected packet name.');
         }
-        // The M6A view decoder returns a Buffer over the retained input storage.
+        // Creation frames use owned storage and stay alive through synchronous decode.
         const message = runtime_message_1.ZLinkBufferMessage.fromOwned(application.payload);
         try {
             return (0, payload_codec_1.decodeFrameworkPayloadMessage)(message, registry, undefined, application.contentType);

package/dist/runtime/protocol/service_wire_codec.generated.d.ts

@@ -859,6 +859,10 @@ export type RequestSpecificTail = {
     readonly terminalResult: "ok";
     readonly bindingGeneration: NonzeroU64;
     readonly authorityOwnerGeneration: NonzeroU64;
+} | {
+    readonly originalOperationKind: "streamBind";
+    readonly terminalResult: "rejected";
+    readonly rejectionMessage: NonemptyText16;
 } | {
     readonly originalOperationKind: "userSpotCreate";
     readonly terminalResult: "ok";