fix(core): Fix stopping and retrying failed executions (#8480)

packages/cli/src/databases/repositories/execution.repository.ts

@@ -649,6 +649,16 @@ export class ExecutionRepository extends Repository<ExecutionEntity> {
 		});
 	}
 
+	async findWithUnflattenedData(executionId: string, accessibleWorkflowIds: string[]) {
+		return await this.findSingleExecution(executionId, {
+			where: {
+				workflowId: In(accessibleWorkflowIds),
+			},
+			includeData: true,
+			unflattenData: true,
+		});
+	}
+
 	async findIfShared(executionId: string, sharedWorkflowIds: string[]) {
 		return await this.findSingleExecution(executionId, {
 			where: {

packages/cli/src/executions/active-execution.service.ts

@@ -104,7 +104,7 @@ export class ActiveExecutionService {
 			};
 		}
 
-		if (!this.isRegularMode) return await this.waitTracker.stopExecution(execution.id);
+		if (this.isRegularMode) return await this.waitTracker.stopExecution(execution.id);
 
 		// queue mode
 

packages/cli/src/executions/execution.service.ts

@@ -179,10 +179,10 @@ export class ExecutionService {
 
 	async retry(req: ExecutionRequest.Retry, sharedWorkflowIds: string[]) {
 		const { id: executionId } = req.params;
-		const execution = (await this.executionRepository.findIfShared(
+		const execution = await this.executionRepository.findWithUnflattenedData(
 			executionId,
 			sharedWorkflowIds,
-		)) as unknown as IExecutionResponse;
+		);
 
 		if (!execution) {
 			this.logger.info(