wallet: join workers outside coordinator

Run worker joining and terminal Vault locking in one helper goroutine.
Report completion for the exact runtime.

Author: yyforyongyu

wallet/manager_lifecycle_coordinator.go

@@ -88,7 +88,7 @@ func (c *walletLifecycleCoordinator) runStop() {
 		return
 	}
 
-	c.entry.teardownErr = c.entry.wallet.finishRuntime()
+	c.finishRuntime()
 }
 
 // abortStart cancels and joins setup before publishing the winning Start
@@ -113,7 +113,7 @@ func (c *walletLifecycleCoordinator) abortStart(req startWalletRequest,
 
 	req.result <- startErr
 
-	c.entry.teardownErr = c.entry.wallet.finishRuntime()
+	c.finishRuntime()
 }
 
 // failStart publishes a setup or worker-publication failure and completes
@@ -128,7 +128,7 @@ func (c *walletLifecycleCoordinator) failStart(req startWalletRequest,
 
 	req.result <- startErr
 
-	c.entry.teardownErr = c.entry.wallet.finishRuntime()
+	c.finishRuntime()
 }
 
 // stopRuntime stops a successfully published runtime.
@@ -140,7 +140,33 @@ func (c *walletLifecycleCoordinator) stopRuntime() {
 		return
 	}
 
-	c.entry.teardownErr = c.entry.wallet.finishRuntime()
+	c.finishRuntime()
+}
+
+// finishRuntime joins blocking worker teardown outside the coordinator and
+// records completion for the exact runtime before the coordinator exits.
+func (c *walletLifecycleCoordinator) finishRuntime() {
+	w := c.entry.wallet
+	teardownDone := make(chan walletTeardownResult, 1)
+
+	go func() {
+		teardownDone <- walletTeardownResult{
+			wallet: w,
+			err:    w.finishRuntime(),
+		}
+	}()
+
+	result := <-teardownDone
+	if result.wallet != w {
+		c.entry.teardownErr = fmt.Errorf(
+			"%w: teardown result runtime changed",
+			ErrWalletNotManaged,
+		)
+
+		return
+	}
+
+	c.entry.teardownErr = result.err
 }
 
 // validateSetupResult rejects a setup completion for any other runtime.

wallet/manager_lifecycle_types.go

@@ -33,6 +33,13 @@ type walletSetupResult struct {
 	err    error
 }
 
+// walletTeardownResult reports worker joining and terminal Vault locking for
+// one exact runtime.
+type walletTeardownResult struct {
+	wallet *Wallet
+	err    error
+}
+
 // newWalletLifecycleCoordinator constructs the lazy lifecycle coordinator.
 func newWalletLifecycleCoordinator(
 	entry *walletRuntimeEntry) *walletLifecycleCoordinator {