@zlink-systems/framework 0.32.0 → 0.32.1

package/dist/runtime/actors/actor-context.js

@@ -59,7 +59,7 @@ class DefaultZLinkActorContext {
         return this.state.boundSession;
     }
     get objectGeneration() {
-        return this.state.nativeActorRef?.generation ?? 1n;
+        return this.state.currentActorRef().generation;
     }
     get spotId() {
         return this.state.spotId;

package/dist/runtime/actors/actor-creation.js

@@ -116,7 +116,7 @@ class ZLinkActorCreationCoordinator {
                 }
             }
             else if (nodeRid !== undefined && updateLocation) {
-                await this.options.locationLifecycle?.setActorRef(actorType, actorId, { actorId, objectGeneration: 1n, meshName, nodeRid }, 0n);
+                await this.options.locationLifecycle?.setActorRef(actorType, actorId, (0, actor_runtime_state_1.toFrameworkActorRef)(state.currentActorRef(), meshName), 0n);
             }
             return { status: 'created', actor, reply: response.reply };
         }

package/dist/runtime/actors/actor-runtime-state.d.ts

@@ -76,6 +76,7 @@ export declare class ZLinkActorRuntimeState {
     private spotGenerationValue;
     private spotMembershipEpochValue;
     private nativeActorRefValue;
+    private nativeActorDestroyed;
     private entryNodeRidValue;
     boundSessionValue: ZLinkRemoteBoundSessionTarget | undefined;
     private remoteActorPacketTargetValue;
@@ -96,6 +97,7 @@ export declare class ZLinkActorRuntimeState {
     get spotMembershipEpoch(): bigint;
     get spotGeneration(): bigint | undefined;
     get nativeActorRef(): ZLinkBackendActorRef | undefined;
+    currentActorRef(): ZLinkBackendActorRef;
     get boundSessionBindingGeneration(): bigint;
     get entryNodeRid(): RoutingId | undefined;
     /** The one current Session binding of this Actor (Session–Actor binding §6). */
@@ -124,7 +126,6 @@ export declare class ZLinkActorRuntimeState {
     setOwnerLeaseGeneration(generation: bigint): void;
     getOrStartDestroy(entryNodeRid: RoutingId, destroy: (actorRef: ZLinkBackendActorRef | undefined) => Promise<void>): Promise<void>;
     markNativeActorDestroyed(actorRef: ZLinkBackendActorRef): void;
-    clearFailedDestroy(task: Promise<void>): void;
     ensureContext(createContext: () => ZLinkActorContext): ZLinkActorContext;
     getOrStartCreation(actorType: string, failIfExists: boolean, createActor: () => Promise<ZLinkActorCreationAttemptResult>): ZLinkActorCreationOperation;
     clearFailedCreation(task: Promise<ZLinkActorCreationAttemptResult>): boolean;

package/dist/runtime/actors/actor-runtime-state.js

@@ -3,6 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.ZLinkActorRuntimeState = void 0;
 exports.toFrameworkRoutingId = toFrameworkRoutingId;
 exports.toFrameworkActorRef = toFrameworkActorRef;
+const configuration_1 = require("../configuration");
 const state_lane_1 = require("../execution/state-lane");
 const framework_errors_internal_1 = require("../framework-errors-internal");
 const routing_id_1 = require("../routing-id");
@@ -57,7 +58,9 @@ class ZLinkActorRuntimeState {
     spotIdValue;
     spotGenerationValue;
     spotMembershipEpochValue = 0n;
+    // Preserve the exact incarnation until teardown finalization, even after native removal.
     nativeActorRefValue;
+    nativeActorDestroyed = false;
     entryNodeRidValue;
     boundSessionValue;
     remoteActorPacketTargetValue;
@@ -103,6 +106,12 @@ class ZLinkActorRuntimeState {
     get nativeActorRef() {
         return this.nativeActorRefValue;
     }
+    currentActorRef() {
+        if (this.nativeActorRefValue === undefined) {
+            throw new configuration_1.ZLinkConfigurationException(`Actor '${this.actorId}' lifecycle identity is not initialized.`);
+        }
+        return this.nativeActorRefValue;
+    }
     get boundSessionBindingGeneration() {
         return this.boundSessionValue?.bindingGeneration ?? 0n;
     }
@@ -194,20 +203,23 @@ class ZLinkActorRuntimeState {
             !(0, routing_id_1.routingIdsEqual)(toFrameworkRoutingId(actorRef.nodeRid), entryNodeRid)) {
             throw (0, framework_errors_internal_1.createInternalFrameworkException)(framework_errors_internal_1.ZLinkFrameworkInternalErrorKind.ActorRouteNotFound, `Actor '${this.actorId}' is not owned by this Entry Spot.`);
         }
-        const task = Promise.resolve().then(() => destroy(actorRef));
+        const task = Promise.resolve()
+            .then(() => destroy(this.nativeActorDestroyed ? undefined : actorRef))
+            .catch((error) => {
+            // A caller may start another attempt only after this attempt has failed.
+            if (this.destroyTask === task) {
+                this.destroyTask = undefined;
+                this.movingValue = false;
+            }
+            throw error;
+        });
         this.destroyTask = task;
         return task;
     }
     markNativeActorDestroyed(actorRef) {
         if (this.nativeActorRefValue === actorRef) {
-            this.nativeActorRefValue = undefined;
-        }
-    }
-    clearFailedDestroy(task) {
-        if (this.destroyTask === task) {
-            this.destroyTask = undefined;
+            this.nativeActorDestroyed = true;
         }
-        this.movingValue = false;
     }
     ensureContext(createContext) {
         this.context ??= createContext();
@@ -243,6 +255,7 @@ class ZLinkActorRuntimeState {
             this.createRequestPayloadValue = undefined;
             this.configured = false;
             this.nativeActorRefValue = undefined;
+            this.nativeActorDestroyed = false;
             this.entryNodeRidValue = undefined;
             return true;
         }
@@ -278,6 +291,7 @@ class ZLinkActorRuntimeState {
     }
     setNativeActorRef(actorRef) {
         this.nativeActorRefValue = actorRef;
+        this.nativeActorDestroyed = false;
         this.entryNodeRidValue ??= toFrameworkRoutingId(actorRef.nodeRid);
     }
     /** @internal Installs one authority-confirmed binding inside its Actor owner turn. */
@@ -344,6 +358,7 @@ class ZLinkActorRuntimeState {
         this.spotGenerationValue = undefined;
         this.spotMembershipEpochValue = 0n;
         this.nativeActorRefValue = undefined;
+        this.nativeActorDestroyed = false;
         this.entryNodeRidValue = undefined;
         this.boundSessionValue = undefined;
         this.remoteActorPacketTargetValue = undefined;
@@ -366,6 +381,7 @@ class ZLinkActorRuntimeState {
         this.spotValue = undefined;
         this.spotIdValue = undefined;
         this.nativeActorRefValue = undefined;
+        this.nativeActorDestroyed = false;
         // The arriving relocation installs the binding it carries.
         this.boundSessionValue = undefined;
         this.remoteActorPacketTargetValue = undefined;

package/dist/runtime/actors/index.d.ts

@@ -64,7 +64,7 @@ export declare class DefaultZLinkActorManager implements ZLinkActorManager {
     private awaitActorDestroy;
     getOrCreateActor(actorId: string, actorType: string, signal?: AbortSignal): Promise<ZLinkActor>;
     getOrCreateWithNativeRef(actorId: string, actorType: string, actorRef: ZLinkBackendActorRef, createRequest?: unknown, signal?: AbortSignal): Promise<ZLinkActor>;
-    getOrCreateActorResult(actorId: string, actorType: string, createRequest?: unknown, signal?: AbortSignal): Promise<ZLinkActorLocalCreateResult>;
+    getOrCreateActorResult(actorId: string, actorType: string, createRequest?: unknown, signal?: AbortSignal): Promise<ZLinkActorLocalCreateResult<ActorRef | undefined>>;
     createReservedActorResult(actorId: string, actorType: string, createRequest: unknown, signal?: AbortSignal, nativeActorRef?: ZLinkBackendActorRef): Promise<ZLinkActorLocalCreateResult>;
     adoptCreatedAuthority(actorId: string, authorityOwnerGeneration: bigint, ownerLeaseGeneration: bigint): void;
     getState(actorId: string): ZLinkActorRuntimeState | undefined;
@@ -77,10 +77,10 @@ export declare class DefaultZLinkActorManager implements ZLinkActorManager {
     private getOrCreateState;
     private actorRefForState;
 }
-export type ZLinkActorLocalCreateResult = {
+export type ZLinkActorLocalCreateResult<TActorRef extends ActorRef | undefined = ActorRef> = {
     readonly status: 'existing' | 'created';
     readonly actor: ZLinkActor;
-    readonly actorRef: ActorRef;
+    readonly actorRef: TActorRef;
     readonly reply?: unknown;
 } | {
     readonly status: 'rejected';

package/dist/runtime/actors/index.js

@@ -17,7 +17,6 @@ const actor_creation_1 = require("./actor-creation");
 const actor_runtime_state_1 = require("./actor-runtime-state");
 const transferred_actor_rollback_1 = require("./transferred-actor-rollback");
 const ACTOR_CREATION_RETRY_INTERVAL_MS = 5;
-const LOCAL_DIAGNOSTIC_NODE_RID = 'local';
 var actor_client_1 = require("./actor-client");
 Object.defineProperty(exports, "DefaultZLinkActorClient", { enumerable: true, get: function () { return actor_client_1.DefaultZLinkActorClient; } });
 var actor_context_1 = require("./actor-context");
@@ -100,7 +99,7 @@ class DefaultZLinkActorManager {
         if (this.relocationStaged.has(actorId))
             return undefined;
         const state = this.states.get(actorId);
-        if (state?.actor !== undefined) {
+        if (state?.actor !== undefined && state.nativeActorRef !== undefined) {
             return this.actorRefForState(state);
         }
         return await this.options.actorRefResolver?.resolveActorRef(actorId, signal);
@@ -111,7 +110,9 @@ class DefaultZLinkActorManager {
     async findSpot(actorId, signal) {
         (0, abort_1.throwIfAborted)(signal);
         const state = this.states.get(actorId);
-        if (state?.actor === undefined || state.spotId === undefined)
+        if (state?.actor === undefined ||
+            state.spotId === undefined ||
+            state.nativeActorRef === undefined)
             return undefined;
         const spotId = state.spotId;
         const actorRef = this.actorRefForState(state);
@@ -162,13 +163,7 @@ class DefaultZLinkActorManager {
             }
             await this.finalizeDestroyedActor(actor.actorId, state);
         }));
-        try {
-            await this.awaitActorDestroy(state, destroyTask);
-        }
-        catch (error) {
-            state.clearFailedDestroy(destroyTask);
-            throw error;
-        }
+        await this.awaitActorDestroy(state, destroyTask);
         return true;
     }
     async materializeTransferredActor(actorId, actorType, adapterKey, transferState, signal) {
@@ -235,9 +230,10 @@ class DefaultZLinkActorManager {
         if (result.status === 'failed') {
             throw actorApplicationFailure(actorId, result.error);
         }
+        const actorRef = result.actorRef ?? this.actorRefForState(this.states.get(actorId));
         return result.reply === undefined
-            ? { status: result.status, actor: result.actorRef }
-            : { status: result.status, actor: result.actorRef, reply: result.reply };
+            ? { status: result.status, actor: actorRef }
+            : { status: result.status, actor: actorRef, reply: result.reply };
     }
     ensureActorTypeBelongsToMesh(meshName, actorType) {
         const registeredMesh = this.options.actorMeshNameProvider?.(actorType);
@@ -442,7 +438,13 @@ class DefaultZLinkActorManager {
     }
     async createReservedActorResult(actorId, actorType, createRequest, signal, nativeActorRef) {
         this.rememberActorMeshFromType(actorId, actorType);
-        return await this.createOrGet(actorId, actorType, false, createRequest, signal, false, Registration_1.DEFAULT_REQUEST_TIMEOUT_MS, nativeActorRef);
+        const result = await this.createOrGet(actorId, actorType, false, createRequest, signal, false, Registration_1.DEFAULT_REQUEST_TIMEOUT_MS, nativeActorRef);
+        if (result.status === 'failed' || result.status === 'rejected')
+            return result;
+        return {
+            ...result,
+            actorRef: this.actorRefForState(this.states.get(actorId))
+        };
     }
     adoptCreatedAuthority(actorId, authorityOwnerGeneration, ownerLeaseGeneration) {
         const state = this.states.get(actorId);
@@ -473,7 +475,7 @@ class DefaultZLinkActorManager {
             throw (0, framework_errors_internal_1.createInternalFrameworkException)(framework_errors_internal_1.ZLinkFrameworkInternalErrorKind.ActorRouteNotFound, `Actor '${actor.context.actorId}' must leave its current SPOT before destroy.`);
         }
         const destroyTask = state.getOrStartDestroy(entryNodeRid, (actorRef) => this.terminateActor(state, async () => {
-            const destroyedActorRef = actorRef === undefined ? undefined : (0, actor_runtime_state_1.toFrameworkActorRef)(actorRef, state.meshName ?? '');
+            const destroyedActorRef = state.nativeActorRef === undefined ? undefined : this.actorRefForState(state);
             if (actorRef !== undefined) {
                 await node.destroyActor(actorRef, 0, destroySignal);
                 state.markNativeActorDestroyed(actorRef);
@@ -483,13 +485,7 @@ class DefaultZLinkActorManager {
             }
             await this.finalizeDestroyedActor(actor.context.actorId, state);
         }));
-        try {
-            await this.awaitActorDestroy(state, destroyTask);
-        }
-        catch (error) {
-            state.clearFailedDestroy(destroyTask);
-            throw error;
-        }
+        await this.awaitActorDestroy(state, destroyTask);
     }
     async createOrGet(actorId, actorType, failIfExists, request, signal, claimLocation = true, timeoutMs = Registration_1.DEFAULT_REQUEST_TIMEOUT_MS, nativeActorRef) {
         const deadline = performance.now() + timeoutMs;
@@ -533,7 +529,7 @@ class DefaultZLinkActorManager {
             try {
                 const result = await operation.task;
                 if (result.status === 'created') {
-                    const actorRef = this.actorRefForState(state);
+                    const actorRef = state.nativeActorRef === undefined ? undefined : this.actorRefForState(state);
                     return {
                         status: operation.created ? 'created' : 'existing',
                         actor: result.actor,
@@ -602,16 +598,7 @@ class DefaultZLinkActorManager {
         return state;
     }
     actorRefForState(state) {
-        const nativeActorRef = state.nativeActorRef;
-        if (nativeActorRef !== undefined) {
-            return (0, actor_runtime_state_1.toFrameworkActorRef)(nativeActorRef, state.meshName ?? '');
-        }
-        return {
-            actorId: state.actorId,
-            objectGeneration: 1n,
-            meshName: state.meshName ?? '',
-            nodeRid: this.options.actorCreatedNodeRidProvider?.() ?? LOCAL_DIAGNOSTIC_NODE_RID
-        };
+        return (0, actor_runtime_state_1.toFrameworkActorRef)(state.currentActorRef(), state.meshName ?? '');
     }
 }
 exports.DefaultZLinkActorManager = DefaultZLinkActorManager;

package/dist/runtime/locations/actor-location-claims.js

@@ -311,24 +311,23 @@ class ZLinkActorLocationClaims {
         const current = await store.readAuthority(key);
         if (!matchesActorAuthority(current, actorRef, ownerToken))
             return;
-        const result = await store.compareExchangeAuthority(key, current.storeVersion, {
+        let result = await store.compareExchangeAuthority(key, current.storeVersion, {
             kind: 'delete'
         });
-        if (result.kind === 'deleted' ||
-            (result.kind === 'conflict' && result.current.kind === 'missing')) {
-            return;
-        }
         if (result.kind === 'conflict' &&
             result.current.kind === 'snapshot' &&
             matchesActorAuthority(result.current, actorRef, ownerToken)) {
-            const retry = await store.compareExchangeAuthority(key, result.current.storeVersion, {
+            result = await store.compareExchangeAuthority(key, result.current.storeVersion, {
                 kind: 'delete'
             });
-            if (retry.kind === 'deleted' ||
-                (retry.kind === 'conflict' && retry.current.kind === 'missing')) {
-                return;
-            }
         }
+        if (result.kind === 'deleted' ||
+            (result.kind === 'conflict' && result.current.kind === 'missing')) {
+            return;
+        }
+        throw new Errors_1.ZLinkFrameworkException(result.kind === 'conflict'
+            ? classifyMembershipAuthorityFailure(result.current, actorRef)
+            : Errors_1.ZLinkFrameworkErrorKind.InternalFailure, `Actor '${actorId}' authority release was rejected with status ${result.kind}.`);
     }
 }
 exports.ZLinkActorLocationClaims = ZLinkActorLocationClaims;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@zlink-systems/framework",
-  "version": "0.32.0",
+  "version": "0.32.1",
   "license": "SEE LICENSE IN LICENSE",
   "repository": {
     "type": "git",
@@ -19,7 +19,7 @@
   "dependencies": {
     "@opentelemetry/api": "^1.9.1",
     "@opentelemetry/api-logs": "^0.221.0",
-    "@zlink-systems/stream-wire": "0.32.0",
+    "@zlink-systems/stream-wire": "0.32.1",
     "@zlink-systems/zlink": "1.23.0"
   }
 }

package/src/runtime/actors/actor-context.ts

@@ -97,7 +97,7 @@ export class DefaultZLinkActorContext implements ZLinkActorContext {
   }
 
   get objectGeneration(): bigint {
-    return this.state.nativeActorRef?.generation ?? 1n;
+    return this.state.currentActorRef().generation;
   }
 
   get spotId(): SpotId | undefined {

package/src/runtime/actors/actor-creation.ts

@@ -211,7 +211,7 @@ export class ZLinkActorCreationCoordinator {
         await this.options.locationLifecycle?.setActorRef(
           actorType,
           actorId,
-          { actorId, objectGeneration: 1n, meshName, nodeRid },
+          toFrameworkActorRef(state.currentActorRef(), meshName),
           0n
         );
       }

package/src/runtime/actors/actor-runtime-state.ts

@@ -9,6 +9,7 @@ import {
 
 import type { Message } from '../../contracts/Common/Message';
 import type { ZLinkBackendActorRef, ZLinkBackendMeshNode } from '../backend/contracts';
+import { ZLinkConfigurationException } from '../configuration';
 import { isStructuralGuardEnabled } from '../execution/state-lane';
 import {
   ZLinkFrameworkInternalErrorKind,
@@ -172,7 +173,9 @@ export class ZLinkActorRuntimeState {
   private spotIdValue: RoutingId | undefined;
   private spotGenerationValue: bigint | undefined;
   private spotMembershipEpochValue = 0n;
+  // Preserve the exact incarnation until teardown finalization, even after native removal.
   private nativeActorRefValue: ZLinkBackendActorRef | undefined;
+  private nativeActorDestroyed = false;
   private entryNodeRidValue: RoutingId | undefined;
   boundSessionValue: ZLinkRemoteBoundSessionTarget | undefined;
   private remoteActorPacketTargetValue: ZLinkRemoteActorPacketTarget | undefined;
@@ -228,6 +231,15 @@ export class ZLinkActorRuntimeState {
     return this.nativeActorRefValue;
   }
 
+  currentActorRef(): ZLinkBackendActorRef {
+    if (this.nativeActorRefValue === undefined) {
+      throw new ZLinkConfigurationException(
+        `Actor '${this.actorId}' lifecycle identity is not initialized.`
+      );
+    }
+    return this.nativeActorRefValue;
+  }
+
   get boundSessionBindingGeneration(): bigint {
     return this.boundSessionValue?.bindingGeneration ?? 0n;
   }
@@ -355,24 +367,26 @@ export class ZLinkActorRuntimeState {
       );
     }
 
-    const task = Promise.resolve().then(() => destroy(actorRef));
+    const task = Promise.resolve()
+      .then(() => destroy(this.nativeActorDestroyed ? undefined : actorRef))
+      .catch((error: unknown) => {
+        // A caller may start another attempt only after this attempt has failed.
+        if (this.destroyTask === task) {
+          this.destroyTask = undefined;
+          this.movingValue = false;
+        }
+        throw error;
+      });
     this.destroyTask = task;
     return task;
   }
 
   markNativeActorDestroyed(actorRef: ZLinkBackendActorRef): void {
     if (this.nativeActorRefValue === actorRef) {
-      this.nativeActorRefValue = undefined;
+      this.nativeActorDestroyed = true;
     }
   }
 
-  clearFailedDestroy(task: Promise<void>): void {
-    if (this.destroyTask === task) {
-      this.destroyTask = undefined;
-    }
-    this.movingValue = false;
-  }
-
   ensureContext(createContext: () => ZLinkActorContext): ZLinkActorContext {
     this.context ??= createContext();
     return this.context;
@@ -425,6 +439,7 @@ export class ZLinkActorRuntimeState {
       this.createRequestPayloadValue = undefined;
       this.configured = false;
       this.nativeActorRefValue = undefined;
+      this.nativeActorDestroyed = false;
       this.entryNodeRidValue = undefined;
       return true;
     }
@@ -474,6 +489,7 @@ export class ZLinkActorRuntimeState {
 
   setNativeActorRef(actorRef: ZLinkBackendActorRef): void {
     this.nativeActorRefValue = actorRef;
+    this.nativeActorDestroyed = false;
     this.entryNodeRidValue ??= toFrameworkRoutingId(actorRef.nodeRid);
   }
 
@@ -556,6 +572,7 @@ export class ZLinkActorRuntimeState {
     this.spotGenerationValue = undefined;
     this.spotMembershipEpochValue = 0n;
     this.nativeActorRefValue = undefined;
+    this.nativeActorDestroyed = false;
     this.entryNodeRidValue = undefined;
     this.boundSessionValue = undefined;
     this.remoteActorPacketTargetValue = undefined;
@@ -578,6 +595,7 @@ export class ZLinkActorRuntimeState {
     this.spotValue = undefined;
     this.spotIdValue = undefined;
     this.nativeActorRefValue = undefined;
+    this.nativeActorDestroyed = false;
     // The arriving relocation installs the binding it carries.
     this.boundSessionValue = undefined;
     this.remoteActorPacketTargetValue = undefined;

package/src/runtime/actors/index.ts

@@ -40,7 +40,6 @@ import {
 } from './actor-runtime-state';
 import { ZLinkTransferredActorRollbackCoordinator } from './transferred-actor-rollback';
 const ACTOR_CREATION_RETRY_INTERVAL_MS = 5;
-const LOCAL_DIAGNOSTIC_NODE_RID = 'local';
 
 export { DefaultZLinkActorClient, type ZLinkActorClientOptions } from './actor-client';
 export { DefaultZLinkActorContext, ZLINK_ACTOR_JOIN_ENTRY_SPOT_RUNTIME } from './actor-context';
@@ -167,7 +166,7 @@ export class DefaultZLinkActorManager implements ZLinkActorManager {
     throwIfAborted(signal);
     if (this.relocationStaged.has(actorId)) return undefined;
     const state = this.states.get(actorId);
-    if (state?.actor !== undefined) {
+    if (state?.actor !== undefined && state.nativeActorRef !== undefined) {
       return this.actorRefForState(state);
     }
     return await this.options.actorRefResolver?.resolveActorRef(actorId, signal);
@@ -182,7 +181,12 @@ export class DefaultZLinkActorManager implements ZLinkActorManager {
   async findSpot(actorId: string, signal?: AbortSignal): Promise<SpotRef | undefined> {
     throwIfAborted(signal);
     const state = this.states.get(actorId);
-    if (state?.actor === undefined || state.spotId === undefined) return undefined;
+    if (
+      state?.actor === undefined ||
+      state.spotId === undefined ||
+      state.nativeActorRef === undefined
+    )
+      return undefined;
     const spotId = state.spotId;
     const actorRef = this.actorRefForState(state);
     return {
@@ -249,12 +253,7 @@ export class DefaultZLinkActorManager implements ZLinkActorManager {
         await this.finalizeDestroyedActor(actor.actorId, state);
       })
     );
-    try {
-      await this.awaitActorDestroy(state, destroyTask);
-    } catch (error) {
-      state.clearFailedDestroy(destroyTask);
-      throw error;
-    }
+    await this.awaitActorDestroy(state, destroyTask);
     return true;
   }
 
@@ -362,9 +361,10 @@ export class DefaultZLinkActorManager implements ZLinkActorManager {
     if (result.status === 'failed') {
       throw actorApplicationFailure(actorId, result.error);
     }
+    const actorRef = result.actorRef ?? this.actorRefForState(this.states.get(actorId)!);
     return result.reply === undefined
-      ? { status: result.status, actor: result.actorRef }
-      : { status: result.status, actor: result.actorRef, reply: result.reply };
+      ? { status: result.status, actor: actorRef }
+      : { status: result.status, actor: actorRef, reply: result.reply };
   }
 
   private ensureActorTypeBelongsToMesh(meshName: string, actorType: string): void {
@@ -638,7 +638,7 @@ export class DefaultZLinkActorManager implements ZLinkActorManager {
     actorType: string,
     createRequest?: unknown,
     signal?: AbortSignal
-  ): Promise<ZLinkActorLocalCreateResult> {
+  ): Promise<ZLinkActorLocalCreateResult<ActorRef | undefined>> {
     this.rememberActorMeshFromType(actorId, actorType);
     return await this.createOrGet(actorId, actorType, false, createRequest, signal);
   }
@@ -651,7 +651,7 @@ export class DefaultZLinkActorManager implements ZLinkActorManager {
     nativeActorRef?: ZLinkBackendActorRef
   ): Promise<ZLinkActorLocalCreateResult> {
     this.rememberActorMeshFromType(actorId, actorType);
-    return await this.createOrGet(
+    const result = await this.createOrGet(
       actorId,
       actorType,
       false,
@@ -661,6 +661,11 @@ export class DefaultZLinkActorManager implements ZLinkActorManager {
       DEFAULT_REQUEST_TIMEOUT_MS,
       nativeActorRef
     );
+    if (result.status === 'failed' || result.status === 'rejected') return result;
+    return {
+      ...result,
+      actorRef: this.actorRefForState(this.states.get(actorId)!)
+    };
   }
 
   adoptCreatedAuthority(
@@ -712,7 +717,7 @@ export class DefaultZLinkActorManager implements ZLinkActorManager {
     const destroyTask = state.getOrStartDestroy(entryNodeRid, (actorRef) =>
       this.terminateActor(state, async () => {
         const destroyedActorRef =
-          actorRef === undefined ? undefined : toFrameworkActorRef(actorRef, state.meshName ?? '');
+          state.nativeActorRef === undefined ? undefined : this.actorRefForState(state);
         if (actorRef !== undefined) {
           await node.destroyActor(actorRef, 0, destroySignal);
           state.markNativeActorDestroyed(actorRef);
@@ -728,12 +733,7 @@ export class DefaultZLinkActorManager implements ZLinkActorManager {
       })
     );
 
-    try {
-      await this.awaitActorDestroy(state, destroyTask);
-    } catch (error) {
-      state.clearFailedDestroy(destroyTask);
-      throw error;
-    }
+    await this.awaitActorDestroy(state, destroyTask);
   }
 
   private async createOrGet(
@@ -745,7 +745,7 @@ export class DefaultZLinkActorManager implements ZLinkActorManager {
     claimLocation = true,
     timeoutMs: number = DEFAULT_REQUEST_TIMEOUT_MS,
     nativeActorRef?: ZLinkBackendActorRef
-  ): Promise<ZLinkActorLocalCreateResult> {
+  ): Promise<ZLinkActorLocalCreateResult<ActorRef | undefined>> {
     const deadline = performance.now() + timeoutMs;
     const requestedMeshName = this.actorMeshNames.get(actorId);
     for (;;) {
@@ -801,7 +801,8 @@ export class DefaultZLinkActorManager implements ZLinkActorManager {
       try {
         const result = await operation.task;
         if (result.status === 'created') {
-          const actorRef = this.actorRefForState(state);
+          const actorRef =
+            state.nativeActorRef === undefined ? undefined : this.actorRefForState(state);
           return {
             status: operation.created ? 'created' : 'existing',
             actor: result.actor,
@@ -886,16 +887,7 @@ export class DefaultZLinkActorManager implements ZLinkActorManager {
   }
 
   private actorRefForState(state: ZLinkActorRuntimeState): ActorRef {
-    const nativeActorRef = state.nativeActorRef;
-    if (nativeActorRef !== undefined) {
-      return toFrameworkActorRef(nativeActorRef, state.meshName ?? '');
-    }
-    return {
-      actorId: state.actorId,
-      objectGeneration: 1n,
-      meshName: state.meshName ?? '',
-      nodeRid: this.options.actorCreatedNodeRidProvider?.() ?? LOCAL_DIAGNOSTIC_NODE_RID
-    };
+    return toFrameworkActorRef(state.currentActorRef(), state.meshName ?? '');
   }
 }
 
@@ -994,11 +986,11 @@ class ZLinkActorGetOrCreateCallRuntime
   extends ZLinkActorCreateCallRuntime
   implements ZLinkActorGetOrCreateCall {}
 
-export type ZLinkActorLocalCreateResult =
+export type ZLinkActorLocalCreateResult<TActorRef extends ActorRef | undefined = ActorRef> =
   | {
       readonly status: 'existing' | 'created';
       readonly actor: ZLinkActor;
-      readonly actorRef: ActorRef;
+      readonly actorRef: TActorRef;
       readonly reply?: unknown;
     }
   | {
@@ -1010,7 +1002,10 @@ export type ZLinkActorLocalCreateResult =
       readonly error: unknown;
     };
 
-function requireCreatedActor(result: ZLinkActorLocalCreateResult, actorId: string): ZLinkActor {
+function requireCreatedActor(
+  result: ZLinkActorLocalCreateResult<ActorRef | undefined>,
+  actorId: string
+): ZLinkActor {
   if (result.status === 'existing' || result.status === 'created') return result.actor;
   if (result.status === 'failed') {
     throw actorApplicationFailure(actorId, result.error);

package/src/runtime/locations/actor-location-claims.ts

@@ -426,30 +426,30 @@ export class ZLinkActorLocationClaims {
     const current = await store.readAuthority(key);
     if (!matchesActorAuthority(current, actorRef, ownerToken)) return;
 
-    const result = await store.compareExchangeAuthority(key, current.storeVersion, {
+    let result = await store.compareExchangeAuthority(key, current.storeVersion, {
       kind: 'delete'
     });
-    if (
-      result.kind === 'deleted' ||
-      (result.kind === 'conflict' && result.current.kind === 'missing')
-    ) {
-      return;
-    }
     if (
       result.kind === 'conflict' &&
       result.current.kind === 'snapshot' &&
       matchesActorAuthority(result.current, actorRef, ownerToken)
     ) {
-      const retry = await store.compareExchangeAuthority(key, result.current.storeVersion, {
+      result = await store.compareExchangeAuthority(key, result.current.storeVersion, {
         kind: 'delete'
       });
-      if (
-        retry.kind === 'deleted' ||
-        (retry.kind === 'conflict' && retry.current.kind === 'missing')
-      ) {
-        return;
-      }
     }
+    if (
+      result.kind === 'deleted' ||
+      (result.kind === 'conflict' && result.current.kind === 'missing')
+    ) {
+      return;
+    }
+    throw new ZLinkFrameworkException(
+      result.kind === 'conflict'
+        ? classifyMembershipAuthorityFailure(result.current, actorRef)
+        : ZLinkFrameworkErrorKind.InternalFailure,
+      `Actor '${actorId}' authority release was rejected with status ${result.kind}.`
+    );
   }
 }