@zq-silk/yui 0.15.5 → 0.15.6

package/dist/controller/runtimeLaunchCoordinator.js

@@ -76,8 +76,9 @@ export class RuntimeLaunchCoordinator {
         if (request.owner.scope === "global" && request.managedWorkspace !== undefined) {
             throw new Error("A global runtime cannot use a Task ManagedWorkspace.");
         }
+        let currentRequest = request;
         const assertLaunchCurrent = () => {
-            this.#assertCurrent?.(request);
+            this.#assertCurrent?.(currentRequest);
             assertCurrent?.();
         };
         const proposedGenerationId = requireText(this.#createGenerationId(), "Launch generation id");
@@ -155,8 +156,20 @@ export class RuntimeLaunchCoordinator {
                 throw new Error("Runtime host reported its pre-start launch fence more than once.");
             }
             validateRuntimeLaunchPreflight(preflight, request, runtimeGenerationId);
+            this.reservations.confirmRuntimeLaunchReservation({
+                owner: request.owner,
+                runtimeGenerationId
+            }, assertLaunchCurrent);
             preflightObserved = true;
             beforeHostStart?.(preflight);
+            // The pre-start persistence callback hands the fixed native Session to
+            // this reserved activation. From here on, fence against that exact new
+            // identity, not the historical Host we originally set out to restore.
+            // Do not accept both identities: a later change back is stale as well.
+            if (request.mode === "resume" && request.hostActivationId !== undefined) {
+                currentRequest = { ...request, hostActivationId: runtimeGenerationId };
+            }
+            assertLaunchCurrent();
         };
         let binding;
         try {
@@ -257,7 +270,7 @@ export class RuntimeLaunchCoordinator {
             throw error;
         }
         if (reusedConfirmedRunningHost && binding.hostCreated === true) {
-            await this.#compensateStartedHost(request.owner, binding, runtimeGenerationId, runtimeIsolation, new Error(`Runtime host was recreated while recovering an existing generation: ${request.owner.roleName}.`));
+            await this.#compensateStartedHost(request.owner, binding, runtimeGenerationId, runtimeIsolation, reusedConfirmedRunningHost, new Error(`Runtime host was recreated while recovering an existing generation: ${request.owner.roleName}.`));
         }
         try {
             assertLaunchCurrent();
@@ -282,7 +295,7 @@ export class RuntimeLaunchCoordinator {
             }
         }
         catch (error) {
-            await this.#compensateStartedHost(request.owner, binding, runtimeGenerationId, runtimeIsolation, error);
+            await this.#compensateStartedHost(request.owner, binding, runtimeGenerationId, runtimeIsolation, reusedConfirmedRunningHost, error);
         }
         return binding;
     }
@@ -317,7 +330,14 @@ export class RuntimeLaunchCoordinator {
             return;
         this.#requireCleanup(request.owner);
     }
-    async #compensateStartedHost(owner, binding, runtimeGenerationId, runtimeIsolation, cause) {
+    async #compensateStartedHost(owner, binding, runtimeGenerationId, runtimeIsolation, reusedConfirmedRunningHost, cause) {
+        if (reusedConfirmedRunningHost && binding.hostCreated !== true) {
+            // Reattaching an existing activation gives this launch no ownership of
+            // it. A fresh activation inside a persistent Host is different: this
+            // launch still owns its startup and isolation cleanup even when the
+            // physical Host did not need to be created.
+            throw new RuntimeLaunchStateChangedError(`Runtime launch state changed while reusing a Host: ${cause instanceof Error ? cause.message : String(cause)}`, { cause });
+        }
         try {
             await this.host.stop(binding);
         }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@zq-silk/yui",
-  "version": "0.15.5",
+  "version": "0.15.6",
   "description": "Local control plane for long-running native agent CLI sessions backed by tmux.",
   "license": "MIT",
   "private": false,