@le-space/ui 0.3.28 → 0.3.31

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@le-space/ui",
-  "version": "0.3.28",
+  "version": "0.3.31",
   "description": "Floating Aleph sponsor relay UI components for Svelte and React.",
   "license": "MIT",
   "type": "module",
@@ -36,8 +36,8 @@
     "access": "public"
   },
   "dependencies": {
-    "@le-space/browser": "0.3.28",
-    "@le-space/core": "0.3.28",
+    "@le-space/browser": "0.3.31",
+    "@le-space/core": "0.3.31",
     "viem": "^2.38.5"
   },
   "peerDependencies": {

package/react/index.js

@@ -28,7 +28,7 @@ var RECENT_INSTANCE_RUNTIME_GRACE_MS = 10 * 60 * 1e3;
 var DEPLOYMENT_PENDING_WARNING_MS = 3 * 60 * 1e3;
 
 // src/shared/package-version.ts
-var UI_PACKAGE_VERSION = "0.3.28";
+var UI_PACKAGE_VERSION = "0.3.31";
 
 // src/shared/format.ts
 function shortHash(value, head = 8, tail = 6) {
@@ -2869,7 +2869,14 @@ function normalizeVmBootstrapConfigSignalRecord(value) {
     instanceItemHash,
     updatedAt,
     publisherAddress: typeof candidate.publisherAddress === "string" && candidate.publisherAddress.trim() ? candidate.publisherAddress.trim() : null,
-    authorization: candidate.authorization
+    authorization: candidate.authorization,
+    peerId: typeof candidate.peerId === "string" && candidate.peerId.trim() ? candidate.peerId.trim() : null,
+    probeMultiaddrs: Array.isArray(candidate.probeMultiaddrs) ? candidate.probeMultiaddrs.filter(
+      (entry) => typeof entry === "string" && entry.trim().length > 0
+    ) : [],
+    browserBootstrapMultiaddrs: Array.isArray(candidate.browserBootstrapMultiaddrs) ? candidate.browserBootstrapMultiaddrs.filter(
+      (entry) => typeof entry === "string" && entry.trim().length > 0
+    ) : []
   };
 }
 async function fetchVmBootstrapConfigSignals(args) {
@@ -3401,6 +3408,7 @@ var SponsorRelayController = class {
     if (!setupPort) {
       throw new Error("Relay runtime did not expose the temporary setup endpoint.");
     }
+    let bootstrapSignalRelayMetadata = null;
     if (profile === "orbitdb-relay-pinner") {
       this.emitProgress({
         stage: "deployment-confirmed",
@@ -3483,6 +3491,14 @@ var SponsorRelayController = class {
             crns: this.state.crns,
             crnListUrl: this.props.crnListUrl
           }).catch(() => latestRuntime);
+          this.emitProgress({
+            stage: "deployment-confirmed",
+            label: "Waiting for HTTPS route",
+            progress: 93,
+            status: latestRuntime.webAccess?.active === true ? "info" : "warning",
+            itemHash: args.itemHash,
+            detail: `2n6 activation ${attempt + 1}/${UI_RUNTIME_WAIT_ATTEMPTS}: ${latestRuntime.webAccess?.active === true ? "active" : "still pending"} for ${latestRuntime.proxyUrl ?? runtime.proxyUrl ?? "reserved proxy URL"}.`
+          });
           this.trace("deploy:bootstrap-proxy-activation", {
             itemHash: args.itemHash,
             attempt: attempt + 1,
@@ -3493,11 +3509,6 @@ var SponsorRelayController = class {
         }
         runtime = latestRuntime;
         mappedPorts2 = runtime.mappedPorts ?? mappedPorts2;
-        if (runtime.proxyUrl && runtime.webAccess?.active !== true) {
-          throw new Error(
-            "Aleph reserved a 2n6 proxy URL, but it never became active in time. Aborting guest HTTPS configuration to avoid a broken Caddy setup."
-          );
-        }
       }
       if (!runtime.hostIpv4) {
         throw new Error("Relay runtime lost its host IPv4 address while waiting for HTTPS activation.");
@@ -3579,46 +3590,85 @@ var SponsorRelayController = class {
           "The relay VM did not confirm that it applied the Aleph bootstrap config in time."
         );
       }
-    }
-    this.emitProgress({
-      stage: "publishing-bootstrap",
-      label: "Reading relay multiaddrs",
-      progress: 95,
-      status: "info",
-      itemHash: args.itemHash,
-      detail: "Waiting for the relay to report its final public multiaddrs."
-    });
-    const relayMetadata = await fetchRelayMetadataForRuntime({
-      runtime,
-      fetch: (url, init) => fetch(url, init),
-      preferSecureMetadata: profile === "uc-go-peer",
-      attempts: 80,
-      delayMs: 3e3,
-      timeoutMs: 24e4,
-      onAttempt: (result) => {
-        const payload = result.payload && typeof result.payload === "object" ? result.payload : null;
-        const metadata = payload?.metadata && typeof payload.metadata === "object" ? payload.metadata : null;
-        this.trace("deploy:relay-metadata-attempt", {
+      bootstrapSignalRelayMetadata = typeof bootstrapConfigSignal.peerId === "string" && bootstrapConfigSignal.peerId.length > 0 && Array.isArray(bootstrapConfigSignal.probeMultiaddrs) && bootstrapConfigSignal.probeMultiaddrs.length > 0 ? {
+        peerId: bootstrapConfigSignal.peerId,
+        probeMultiaddrs: bootstrapConfigSignal.probeMultiaddrs,
+        browserBootstrapMultiaddrs: bootstrapConfigSignal.browserBootstrapMultiaddrs ?? []
+      } : null;
+      if (runtime.proxyUrl && runtime.webAccess?.active !== true) {
+        this.trace("deploy:bootstrap-proxy-fallback", {
+          itemHash: args.itemHash,
+          deploymentToken: args.deploymentToken,
+          proxyUrl: runtime.proxyUrl,
+          bootstrapSignalRelayMetadata
+        });
+        this.emitProgress({
+          stage: "deployment-confirmed",
+          label: "Continuing without HTTPS route",
+          progress: 94,
+          status: "warning",
           itemHash: args.itemHash,
-          attempt: result.attempt,
-          attempts: result.attempts,
-          requestUrl: result.requestUrl,
-          metadataUrl: result.metadataUrl,
-          hostIpv4: result.hostIpv4,
-          setupPort: result.setupPort,
-          ok: result.ok,
-          status: result.status,
-          ready: result.ready,
-          error: result.error ?? null,
-          payloadStatus: payload && typeof payload.status === "string" ? payload.status : null,
-          peerId: metadata && typeof metadata.peer_id === "string" ? metadata.peer_id : null,
-          probeMultiaddrCount: Array.isArray(metadata?.probe_multiaddrs) ? metadata.probe_multiaddrs.length : 0,
-          browserBootstrapMultiaddrCount: Array.isArray(
-            metadata?.browser_bootstrap_multiaddrs
-          ) ? metadata.browser_bootstrap_multiaddrs.length : 0
+          detail: "The 2n6 HTTPS route stayed inactive, so guest setup continued without Caddy. Secure browser routing can be enabled later when the proxy becomes available."
         });
+        runtime = {
+          ...runtime,
+          proxyUrl: null,
+          webAccess: runtime.webAccess ? {
+            ...runtime.webAccess,
+            active: false
+          } : runtime.webAccess
+        };
       }
-    });
+    }
+    let relayMetadata = bootstrapSignalRelayMetadata;
+    if (relayMetadata) {
+      this.trace("deploy:relay-metadata-from-bootstrap-signal", {
+        itemHash: args.itemHash,
+        peerId: relayMetadata.peerId,
+        probeMultiaddrCount: relayMetadata.probeMultiaddrs.length,
+        browserBootstrapMultiaddrCount: relayMetadata.browserBootstrapMultiaddrs.length
+      });
+    } else {
+      this.emitProgress({
+        stage: "publishing-bootstrap",
+        label: "Reading relay multiaddrs",
+        progress: 95,
+        status: "info",
+        itemHash: args.itemHash,
+        detail: "Waiting for the relay to report its final public multiaddrs."
+      });
+      relayMetadata = await fetchRelayMetadataForRuntime({
+        runtime,
+        fetch: (url, init) => fetch(url, init),
+        preferSecureMetadata: profile === "uc-go-peer" && Boolean(runtime.proxyUrl),
+        attempts: 80,
+        delayMs: 3e3,
+        timeoutMs: 24e4,
+        onAttempt: (result) => {
+          const payload = result.payload && typeof result.payload === "object" ? result.payload : null;
+          const metadata = payload?.metadata && typeof payload.metadata === "object" ? payload.metadata : null;
+          this.trace("deploy:relay-metadata-attempt", {
+            itemHash: args.itemHash,
+            attempt: result.attempt,
+            attempts: result.attempts,
+            requestUrl: result.requestUrl,
+            metadataUrl: result.metadataUrl,
+            hostIpv4: result.hostIpv4,
+            setupPort: result.setupPort,
+            ok: result.ok,
+            status: result.status,
+            ready: result.ready,
+            error: result.error ?? null,
+            payloadStatus: payload && typeof payload.status === "string" ? payload.status : null,
+            peerId: metadata && typeof metadata.peer_id === "string" ? metadata.peer_id : null,
+            probeMultiaddrCount: Array.isArray(metadata?.probe_multiaddrs) ? metadata.probe_multiaddrs.length : 0,
+            browserBootstrapMultiaddrCount: Array.isArray(
+              metadata?.browser_bootstrap_multiaddrs
+            ) ? metadata.browser_bootstrap_multiaddrs.length : 0
+          });
+        }
+      });
+    }
     if (!relayMetadata) {
       throw new Error("Relay metadata did not include a peer ID and public multiaddrs.");
     }
@@ -3788,6 +3838,7 @@ var SponsorRelayController = class {
     const currentProgress = this.state.deploymentProgress;
     const currentProgressIsForLatestHash = currentProgress.itemHash === itemHash || currentProgress.itemHash == null && currentProgress.stage !== "idle" && currentProgress.stage !== "error";
     const keepTerminalSuccess = this.lastCompletedDeploymentHash === itemHash || currentProgressIsForLatestHash && currentProgress.stage === "completed" && currentProgress.status === "success";
+    const keepSpecificInFlightProgress = currentProgressIsForLatestHash && currentProgress.stage !== "completed" && currentProgress.stage !== "error" && currentProgress.progress >= 93;
     const status = latest.details.messageStatus;
     if (status === "rejected") {
       this.emitProgress({
@@ -3830,6 +3881,16 @@ var SponsorRelayController = class {
         });
         return;
       }
+      if (keepSpecificInFlightProgress) {
+        this.trace("progress:retain-inflight", {
+          reason: "latest refresh would overwrite a more specific in-flight deployment phase",
+          itemHash,
+          currentStage: currentProgress.stage,
+          currentLabel: currentProgress.label,
+          currentProgress: currentProgress.progress
+        });
+        return;
+      }
       this.emitProgress({
         stage: "deployment-confirmed",
         label: "Waiting for runtime",
@@ -3840,6 +3901,16 @@ var SponsorRelayController = class {
       });
       return;
     }
+    if (keepSpecificInFlightProgress) {
+      this.trace("progress:retain-inflight", {
+        reason: "latest refresh would overwrite a more specific in-flight deployment phase",
+        itemHash,
+        currentStage: currentProgress.stage,
+        currentLabel: currentProgress.label,
+        currentProgress: currentProgress.progress
+      });
+      return;
+    }
     this.emitProgress({
       stage: "deployment-confirmed",
       label: "Runtime ready",
@@ -4470,6 +4541,15 @@ var SponsorRelayController = class {
           });
           if (attemptItemHash) {
             if (attemptDeploymentToken) {
+              this.emitProgress({
+                stage: "refreshing-instances",
+                label: "Cleaning up failed attempt",
+                progress: 16,
+                status: "warning",
+                itemHash: attemptItemHash,
+                detail: `Removing bootstrap handoff state for failed deployment on ${attemptLabel}.`,
+                error: lastError.message
+              });
               this.trace("deploy:bootstrap-config-cleanup-start", {
                 itemHash: attemptItemHash,
                 deploymentToken: attemptDeploymentToken
@@ -4495,8 +4575,26 @@ var SponsorRelayController = class {
                   deploymentToken: attemptDeploymentToken,
                   error: cleanupError instanceof Error ? cleanupError.message : String(cleanupError)
                 });
+                this.emitProgress({
+                  stage: "refreshing-instances",
+                  label: "Cleanup warning",
+                  progress: 16,
+                  status: "warning",
+                  itemHash: attemptItemHash,
+                  detail: `Bootstrap cleanup reported an issue for ${attemptLabel}, but retry cleanup will continue.`,
+                  error: cleanupError instanceof Error ? cleanupError.message : String(cleanupError)
+                });
               });
             }
+            this.emitProgress({
+              stage: "refreshing-instances",
+              label: "Discarding failed deployment",
+              progress: 17,
+              status: "warning",
+              itemHash: attemptItemHash,
+              detail: `Forgetting failed deployment ${attemptItemHash.slice(0, 12)} on ${attemptLabel} before retrying.`,
+              error: lastError.message
+            });
             this.trace("deploy:forget-failed-attempt-start", {
               itemHash: attemptItemHash,
               crnHash: candidateCrn.hash,
@@ -4519,12 +4617,30 @@ var SponsorRelayController = class {
                 itemHash: attemptItemHash,
                 error: cleanupError instanceof Error ? cleanupError.message : String(cleanupError)
               });
+              this.emitProgress({
+                stage: "refreshing-instances",
+                label: "Cleanup warning",
+                progress: 17,
+                status: "warning",
+                itemHash: attemptItemHash,
+                detail: `Failed deployment cleanup reported an issue for ${attemptLabel}.`,
+                error: cleanupError instanceof Error ? cleanupError.message : String(cleanupError)
+              });
             });
             this.trace("deploy:forget-failed-attempt-complete", {
               itemHash: attemptItemHash,
               crnHash: candidateCrn.hash,
               crnName: candidateCrn.name
             });
+            this.emitProgress({
+              stage: "refreshing-instances",
+              label: "Cleanup complete",
+              progress: 18,
+              status: "info",
+              itemHash: attemptItemHash,
+              detail: `Finished cleaning up failed deployment on ${attemptLabel}.`,
+              error: null
+            });
           }
           if (candidateIndex < orderedCrns.length - 1) {
             this.emitProgress({

package/shared/index.d.ts

@@ -290,7 +290,7 @@ declare const STALE_INSTANCE_ALLOCATION_COOLDOWN_MS: number;
 declare const RECENT_INSTANCE_RUNTIME_GRACE_MS: number;
 declare const DEPLOYMENT_PENDING_WARNING_MS: number;
 
-declare const UI_PACKAGE_VERSION = "0.3.28";
+declare const UI_PACKAGE_VERSION = "0.3.31";
 
 interface RootfsRequiredPortForward {
     port: number;

package/shared/index.js

@@ -27,7 +27,7 @@ var RECENT_INSTANCE_RUNTIME_GRACE_MS = 10 * 60 * 1e3;
 var DEPLOYMENT_PENDING_WARNING_MS = 3 * 60 * 1e3;
 
 // src/shared/package-version.ts
-var UI_PACKAGE_VERSION = "0.3.28";
+var UI_PACKAGE_VERSION = "0.3.31";
 
 // src/shared/format.ts
 function shortHash(value, head = 8, tail = 6) {
@@ -2868,7 +2868,14 @@ function normalizeVmBootstrapConfigSignalRecord(value) {
     instanceItemHash,
     updatedAt,
     publisherAddress: typeof candidate.publisherAddress === "string" && candidate.publisherAddress.trim() ? candidate.publisherAddress.trim() : null,
-    authorization: candidate.authorization
+    authorization: candidate.authorization,
+    peerId: typeof candidate.peerId === "string" && candidate.peerId.trim() ? candidate.peerId.trim() : null,
+    probeMultiaddrs: Array.isArray(candidate.probeMultiaddrs) ? candidate.probeMultiaddrs.filter(
+      (entry) => typeof entry === "string" && entry.trim().length > 0
+    ) : [],
+    browserBootstrapMultiaddrs: Array.isArray(candidate.browserBootstrapMultiaddrs) ? candidate.browserBootstrapMultiaddrs.filter(
+      (entry) => typeof entry === "string" && entry.trim().length > 0
+    ) : []
   };
 }
 async function fetchVmBootstrapConfigSignals(args) {
@@ -3400,6 +3407,7 @@ var SponsorRelayController = class {
     if (!setupPort) {
       throw new Error("Relay runtime did not expose the temporary setup endpoint.");
     }
+    let bootstrapSignalRelayMetadata = null;
     if (profile === "orbitdb-relay-pinner") {
       this.emitProgress({
         stage: "deployment-confirmed",
@@ -3482,6 +3490,14 @@ var SponsorRelayController = class {
             crns: this.state.crns,
             crnListUrl: this.props.crnListUrl
           }).catch(() => latestRuntime);
+          this.emitProgress({
+            stage: "deployment-confirmed",
+            label: "Waiting for HTTPS route",
+            progress: 93,
+            status: latestRuntime.webAccess?.active === true ? "info" : "warning",
+            itemHash: args.itemHash,
+            detail: `2n6 activation ${attempt + 1}/${UI_RUNTIME_WAIT_ATTEMPTS}: ${latestRuntime.webAccess?.active === true ? "active" : "still pending"} for ${latestRuntime.proxyUrl ?? runtime.proxyUrl ?? "reserved proxy URL"}.`
+          });
           this.trace("deploy:bootstrap-proxy-activation", {
             itemHash: args.itemHash,
             attempt: attempt + 1,
@@ -3492,11 +3508,6 @@ var SponsorRelayController = class {
         }
         runtime = latestRuntime;
         mappedPorts2 = runtime.mappedPorts ?? mappedPorts2;
-        if (runtime.proxyUrl && runtime.webAccess?.active !== true) {
-          throw new Error(
-            "Aleph reserved a 2n6 proxy URL, but it never became active in time. Aborting guest HTTPS configuration to avoid a broken Caddy setup."
-          );
-        }
       }
       if (!runtime.hostIpv4) {
         throw new Error("Relay runtime lost its host IPv4 address while waiting for HTTPS activation.");
@@ -3578,46 +3589,85 @@ var SponsorRelayController = class {
           "The relay VM did not confirm that it applied the Aleph bootstrap config in time."
         );
       }
-    }
-    this.emitProgress({
-      stage: "publishing-bootstrap",
-      label: "Reading relay multiaddrs",
-      progress: 95,
-      status: "info",
-      itemHash: args.itemHash,
-      detail: "Waiting for the relay to report its final public multiaddrs."
-    });
-    const relayMetadata = await fetchRelayMetadataForRuntime({
-      runtime,
-      fetch: (url, init) => fetch(url, init),
-      preferSecureMetadata: profile === "uc-go-peer",
-      attempts: 80,
-      delayMs: 3e3,
-      timeoutMs: 24e4,
-      onAttempt: (result) => {
-        const payload = result.payload && typeof result.payload === "object" ? result.payload : null;
-        const metadata = payload?.metadata && typeof payload.metadata === "object" ? payload.metadata : null;
-        this.trace("deploy:relay-metadata-attempt", {
+      bootstrapSignalRelayMetadata = typeof bootstrapConfigSignal.peerId === "string" && bootstrapConfigSignal.peerId.length > 0 && Array.isArray(bootstrapConfigSignal.probeMultiaddrs) && bootstrapConfigSignal.probeMultiaddrs.length > 0 ? {
+        peerId: bootstrapConfigSignal.peerId,
+        probeMultiaddrs: bootstrapConfigSignal.probeMultiaddrs,
+        browserBootstrapMultiaddrs: bootstrapConfigSignal.browserBootstrapMultiaddrs ?? []
+      } : null;
+      if (runtime.proxyUrl && runtime.webAccess?.active !== true) {
+        this.trace("deploy:bootstrap-proxy-fallback", {
+          itemHash: args.itemHash,
+          deploymentToken: args.deploymentToken,
+          proxyUrl: runtime.proxyUrl,
+          bootstrapSignalRelayMetadata
+        });
+        this.emitProgress({
+          stage: "deployment-confirmed",
+          label: "Continuing without HTTPS route",
+          progress: 94,
+          status: "warning",
           itemHash: args.itemHash,
-          attempt: result.attempt,
-          attempts: result.attempts,
-          requestUrl: result.requestUrl,
-          metadataUrl: result.metadataUrl,
-          hostIpv4: result.hostIpv4,
-          setupPort: result.setupPort,
-          ok: result.ok,
-          status: result.status,
-          ready: result.ready,
-          error: result.error ?? null,
-          payloadStatus: payload && typeof payload.status === "string" ? payload.status : null,
-          peerId: metadata && typeof metadata.peer_id === "string" ? metadata.peer_id : null,
-          probeMultiaddrCount: Array.isArray(metadata?.probe_multiaddrs) ? metadata.probe_multiaddrs.length : 0,
-          browserBootstrapMultiaddrCount: Array.isArray(
-            metadata?.browser_bootstrap_multiaddrs
-          ) ? metadata.browser_bootstrap_multiaddrs.length : 0
+          detail: "The 2n6 HTTPS route stayed inactive, so guest setup continued without Caddy. Secure browser routing can be enabled later when the proxy becomes available."
         });
+        runtime = {
+          ...runtime,
+          proxyUrl: null,
+          webAccess: runtime.webAccess ? {
+            ...runtime.webAccess,
+            active: false
+          } : runtime.webAccess
+        };
       }
-    });
+    }
+    let relayMetadata = bootstrapSignalRelayMetadata;
+    if (relayMetadata) {
+      this.trace("deploy:relay-metadata-from-bootstrap-signal", {
+        itemHash: args.itemHash,
+        peerId: relayMetadata.peerId,
+        probeMultiaddrCount: relayMetadata.probeMultiaddrs.length,
+        browserBootstrapMultiaddrCount: relayMetadata.browserBootstrapMultiaddrs.length
+      });
+    } else {
+      this.emitProgress({
+        stage: "publishing-bootstrap",
+        label: "Reading relay multiaddrs",
+        progress: 95,
+        status: "info",
+        itemHash: args.itemHash,
+        detail: "Waiting for the relay to report its final public multiaddrs."
+      });
+      relayMetadata = await fetchRelayMetadataForRuntime({
+        runtime,
+        fetch: (url, init) => fetch(url, init),
+        preferSecureMetadata: profile === "uc-go-peer" && Boolean(runtime.proxyUrl),
+        attempts: 80,
+        delayMs: 3e3,
+        timeoutMs: 24e4,
+        onAttempt: (result) => {
+          const payload = result.payload && typeof result.payload === "object" ? result.payload : null;
+          const metadata = payload?.metadata && typeof payload.metadata === "object" ? payload.metadata : null;
+          this.trace("deploy:relay-metadata-attempt", {
+            itemHash: args.itemHash,
+            attempt: result.attempt,
+            attempts: result.attempts,
+            requestUrl: result.requestUrl,
+            metadataUrl: result.metadataUrl,
+            hostIpv4: result.hostIpv4,
+            setupPort: result.setupPort,
+            ok: result.ok,
+            status: result.status,
+            ready: result.ready,
+            error: result.error ?? null,
+            payloadStatus: payload && typeof payload.status === "string" ? payload.status : null,
+            peerId: metadata && typeof metadata.peer_id === "string" ? metadata.peer_id : null,
+            probeMultiaddrCount: Array.isArray(metadata?.probe_multiaddrs) ? metadata.probe_multiaddrs.length : 0,
+            browserBootstrapMultiaddrCount: Array.isArray(
+              metadata?.browser_bootstrap_multiaddrs
+            ) ? metadata.browser_bootstrap_multiaddrs.length : 0
+          });
+        }
+      });
+    }
     if (!relayMetadata) {
       throw new Error("Relay metadata did not include a peer ID and public multiaddrs.");
     }
@@ -3787,6 +3837,7 @@ var SponsorRelayController = class {
     const currentProgress = this.state.deploymentProgress;
     const currentProgressIsForLatestHash = currentProgress.itemHash === itemHash || currentProgress.itemHash == null && currentProgress.stage !== "idle" && currentProgress.stage !== "error";
     const keepTerminalSuccess = this.lastCompletedDeploymentHash === itemHash || currentProgressIsForLatestHash && currentProgress.stage === "completed" && currentProgress.status === "success";
+    const keepSpecificInFlightProgress = currentProgressIsForLatestHash && currentProgress.stage !== "completed" && currentProgress.stage !== "error" && currentProgress.progress >= 93;
     const status = latest.details.messageStatus;
     if (status === "rejected") {
       this.emitProgress({
@@ -3829,6 +3880,16 @@ var SponsorRelayController = class {
         });
         return;
       }
+      if (keepSpecificInFlightProgress) {
+        this.trace("progress:retain-inflight", {
+          reason: "latest refresh would overwrite a more specific in-flight deployment phase",
+          itemHash,
+          currentStage: currentProgress.stage,
+          currentLabel: currentProgress.label,
+          currentProgress: currentProgress.progress
+        });
+        return;
+      }
       this.emitProgress({
         stage: "deployment-confirmed",
         label: "Waiting for runtime",
@@ -3839,6 +3900,16 @@ var SponsorRelayController = class {
       });
       return;
     }
+    if (keepSpecificInFlightProgress) {
+      this.trace("progress:retain-inflight", {
+        reason: "latest refresh would overwrite a more specific in-flight deployment phase",
+        itemHash,
+        currentStage: currentProgress.stage,
+        currentLabel: currentProgress.label,
+        currentProgress: currentProgress.progress
+      });
+      return;
+    }
     this.emitProgress({
       stage: "deployment-confirmed",
       label: "Runtime ready",
@@ -4469,6 +4540,15 @@ var SponsorRelayController = class {
           });
           if (attemptItemHash) {
             if (attemptDeploymentToken) {
+              this.emitProgress({
+                stage: "refreshing-instances",
+                label: "Cleaning up failed attempt",
+                progress: 16,
+                status: "warning",
+                itemHash: attemptItemHash,
+                detail: `Removing bootstrap handoff state for failed deployment on ${attemptLabel}.`,
+                error: lastError.message
+              });
               this.trace("deploy:bootstrap-config-cleanup-start", {
                 itemHash: attemptItemHash,
                 deploymentToken: attemptDeploymentToken
@@ -4494,8 +4574,26 @@ var SponsorRelayController = class {
                   deploymentToken: attemptDeploymentToken,
                   error: cleanupError instanceof Error ? cleanupError.message : String(cleanupError)
                 });
+                this.emitProgress({
+                  stage: "refreshing-instances",
+                  label: "Cleanup warning",
+                  progress: 16,
+                  status: "warning",
+                  itemHash: attemptItemHash,
+                  detail: `Bootstrap cleanup reported an issue for ${attemptLabel}, but retry cleanup will continue.`,
+                  error: cleanupError instanceof Error ? cleanupError.message : String(cleanupError)
+                });
               });
             }
+            this.emitProgress({
+              stage: "refreshing-instances",
+              label: "Discarding failed deployment",
+              progress: 17,
+              status: "warning",
+              itemHash: attemptItemHash,
+              detail: `Forgetting failed deployment ${attemptItemHash.slice(0, 12)} on ${attemptLabel} before retrying.`,
+              error: lastError.message
+            });
             this.trace("deploy:forget-failed-attempt-start", {
               itemHash: attemptItemHash,
               crnHash: candidateCrn.hash,
@@ -4518,12 +4616,30 @@ var SponsorRelayController = class {
                 itemHash: attemptItemHash,
                 error: cleanupError instanceof Error ? cleanupError.message : String(cleanupError)
               });
+              this.emitProgress({
+                stage: "refreshing-instances",
+                label: "Cleanup warning",
+                progress: 17,
+                status: "warning",
+                itemHash: attemptItemHash,
+                detail: `Failed deployment cleanup reported an issue for ${attemptLabel}.`,
+                error: cleanupError instanceof Error ? cleanupError.message : String(cleanupError)
+              });
             });
             this.trace("deploy:forget-failed-attempt-complete", {
               itemHash: attemptItemHash,
               crnHash: candidateCrn.hash,
               crnName: candidateCrn.name
             });
+            this.emitProgress({
+              stage: "refreshing-instances",
+              label: "Cleanup complete",
+              progress: 18,
+              status: "info",
+              itemHash: attemptItemHash,
+              detail: `Finished cleaning up failed deployment on ${attemptLabel}.`,
+              error: null
+            });
           }
           if (candidateIndex < orderedCrns.length - 1) {
             this.emitProgress({